Cleanup of mage-poc