minor cleanup of very old cruft