Remove Rails 4 deprecation warnings