Removing dead code from iteration, preparation for work around its rerender.

@rev jtroup@
@bug W-2052295@
Merging origin/fabbott/master-pending-iterationdead into master