Removed duplicate code

Also renamed NPC back