Cleaned up and synced the model with the db