cleans up for Rails 4