cleanup lots of old cruft