Cleanup
Rails 4 support