Meganisi cleanups (44)