Clean up and new rails models