Meganisi cleanups (62)