Meganisi cleanups (47)