Meganisi cleanups (64)