Removed the double lists and iterators