Remove deprecations
#30945

rafaelfranca wants to merge rafaelfranca:remove-deprecations into rails:master

We do not currently have an analysis of these two commits