Meganisi cleanups (7)