Rails 4 fix
Cleanup