Cleanups for mmn18