Meganisi cleanups (33)