Remove noop code