Clean up rails controllers and models