removed Rails 4.x deprecation warnings