Meganisi cleanups (66)