Meganisi cleanups (20)