Clean up deprecations for Rails 4