Remove stuff that was ported into upstream