remove some more old format cruft