Meganisi cleanups (29)