-Deleted lots of unused code
Merge remote-tracking branch 'origin/master-remove-db'