Meganisi cleanups (68)