Meganisi cleanups (15)