Database Model Cleanup