Fixed Bug in Range iterators.
Removed unused TODO