Meganisi cleanups (5)