more mmu cleanups