PER-103 Removing some more wfMagic