Remove some stuff that I'll never push upstream.