clean up some iterators