Updates to memory class, more file cleanup