More clean up of ZFromData.cc