More memory manager cleanup. o.o