Simplify implementation by removing useless iteratoriterator