Fix iterator remove() for NPCs