Removed NPC statements from move function