Meganisi cleanups (24)