Removed refs to old iterators

No more simple, usimple, or averaging
Removed old iterators

No more simple, usimple, or averaging
Replaced old with new iterators

No more simple, usimple, or averaging