Remove some old cruft.