Let's try to clean up the db