Meganisi cleanups (21)