Meganisi cleanups (58)