Corrected iterator removals