Remove unneeded noop