Meganisi cleanups (13)