Meganisi cleanups (40)