Meganisi cleanups (6)