Meganisi cleanups (51)