Remove NOOP var and force --noop