Core/Phases: Removed more of the old phasemasks