remove iterator safety issues