Updates in db
Some minor changes
Removed unused imports