Remove unnecessary noop