Remove some old cruft in preparation for squashing.