clean-up of old cruft