SQL Model Cleanup