Remove unnecessary differences with upstream