Removed poorly designed NPCManager class and other minor changes