removed old zz* cruft