Meganisi cleanups (25)