Cleaned up the db model.