Meganisi cleanups (37)