removing unused code and fixing some namespaces
Merge branch 'database-infrastructure' into dev