Cleaning up data in the database