removing dependency to Mongo (WIP)