Meganisi cleanups (27)