clean-up and remove old cruft