Database cleanup
Merge pull request #214 from ratan12/Database

DatabaseManager cleanup