Cleaning up db and models