Meganisi cleanups (31)