Switched to using a persistent remapped collection
Removed some old functions and added documentation