Remove zip iteration
Minor housekeeping