Rails 4 Upgrade Part 3 and Cleanup