Remove more broken things.