Class level methods no longer inherit scoping in Rails 6.1

Let's fix the warnings now to have the correct behavior
when we migrate to 6.1