Removing lots of old code.
Removing large chunks of old comments.
Make the data pair iterator a proper iterator.