Meganisi cleanups (10)