Ongoing work to remove mmap