Remove shipping/billing identifier from mage entities