Remove passive mapping as a DS mut, re-tier some other mutations