Cleanup
Upgrading to Rails 4.1