Removed the remaining unnecessary stl style iterators.