Cleaned up the database a bit