remove some old cruft