Remove overrides no longer needed

Spree core was modified to improve assemblies support, see
https://github.com/spree/spree/pull/3991
More update to reflect recent change in spree core api
Remove MOAR overrides