remove cruft.
sync with upstream.
actually remove all cruft.