Meganisi cleanups (19)