Meganisi cleanups (17)