Simplify, map more to <Nop>