removed iterator junk