Clean up Future mess. Refactor DB class structure.