Code-First Clean up