[SHAPER]: Mark for removal.