Meganisi cleanups (57)