Remove some old cruft