Clean up adapter section and fix mongo references (WIP)