Meganisi cleanups (55)