Rails 4 compat cleanup