Need to merge with master thread

NPC clearing changed.