Meganisi cleanups (65)