Fix indicator removal loop

Change to use more efficient loop structure.