Remove unnecesary methods

* Follows comment Remove when merged https://github.com/spree/spree/pull/4615
Merge branch 'master' into feature/multi-address-styling