Remove iterator references in code