more removal of redundant internal iterators