Cleaning up db
Fixing