Removed some more magic