Some Mage Clean-ups