remove lots of old cruft