Set back to mem db
Removed unused code