Remove a whole bunch of unnecessary differences from upstream.