Meganisi cleanups (69)