Meganisi cleanups (4)(2)