Meganisi cleanups (59)