Removed NPC class