Removed all the complexity added by the iterators.