Implemented new database interface. Removed some singletons
Removed some not used/deprecated files