remove obsolete cruft