Merge "Remove noop code"