Meganisi cleanups (63)