cleanup Z dictionary code for when ossf!=2