diff --git a/dpo_training.py b/dpo_training.py
index 1370cfb..23d1ee8 100644
--- a/dpo_training.py
+++ b/dpo_training.py
@@ -18,7 +18,6 @@
     BloomForCausalLM,
     AutoModelForCausalLM,
     AutoModel,
-    LlamaTokenizer,
     LlamaForCausalLM,
     BloomTokenizerFast,
     AutoTokenizer,
@@ -37,7 +36,7 @@
 MODEL_CLASSES = {
     "bloom": (AutoConfig, BloomForCausalLM, BloomTokenizerFast),
     "chatglm": (AutoConfig, AutoModel, AutoTokenizer),
-    "llama": (AutoConfig, LlamaForCausalLM, LlamaTokenizer),
+    "llama": (AutoConfig, LlamaForCausalLM, AutoTokenizer),
     "baichuan": (AutoConfig, AutoModelForCausalLM, AutoTokenizer),
     "auto": (AutoConfig, AutoModelForCausalLM, AutoTokenizer),
 }
diff --git a/fastapi_server_demo.py b/fastapi_server_demo.py
index 8351cdb..3362664 100644
--- a/fastapi_server_demo.py
+++ b/fastapi_server_demo.py
@@ -31,7 +31,6 @@
     AutoTokenizer,
     BloomForCausalLM,
     BloomTokenizerFast,
-    LlamaTokenizer,
     LlamaForCausalLM,
     TextIteratorStreamer,
     GenerationConfig,
@@ -42,7 +41,7 @@
 MODEL_CLASSES = {
     "bloom": (BloomForCausalLM, BloomTokenizerFast),
     "chatglm": (AutoModel, AutoTokenizer),
-    "llama": (LlamaForCausalLM, LlamaTokenizer),
+    "llama": (LlamaForCausalLM, AutoTokenizer),
     "baichuan": (AutoModelForCausalLM, AutoTokenizer),
     "auto": (AutoModelForCausalLM, AutoTokenizer),
 }
diff --git a/gradio_demo.py b/gradio_demo.py
index 26e708d..5cd713a 100644
--- a/gradio_demo.py
+++ b/gradio_demo.py
@@ -17,7 +17,6 @@
     AutoModelForCausalLM,
     BloomForCausalLM,
     BloomTokenizerFast,
-    LlamaTokenizer,
     LlamaForCausalLM,
     GenerationConfig,
     TextIteratorStreamer,
@@ -28,7 +27,7 @@
 MODEL_CLASSES = {
     "bloom": (BloomForCausalLM, BloomTokenizerFast),
     "chatglm": (AutoModel, AutoTokenizer),
-    "llama": (LlamaForCausalLM, LlamaTokenizer),
+    "llama": (LlamaForCausalLM, AutoTokenizer),
     "baichuan": (AutoModelForCausalLM, AutoTokenizer),
     "auto": (AutoModelForCausalLM, AutoTokenizer),
 }
diff --git a/inference.py b/inference.py
index a3e7af8..43c55af 100644
--- a/inference.py
+++ b/inference.py
@@ -17,7 +17,6 @@
     AutoTokenizer,
     BloomForCausalLM,
     BloomTokenizerFast,
-    LlamaTokenizer,
     LlamaForCausalLM,
     TextIteratorStreamer,
     GenerationConfig,
@@ -29,7 +28,7 @@
 MODEL_CLASSES = {
     "bloom": (BloomForCausalLM, BloomTokenizerFast),
     "chatglm": (AutoModel, AutoTokenizer),
-    "llama": (LlamaForCausalLM, LlamaTokenizer),
+    "llama": (LlamaForCausalLM, AutoTokenizer),
     "baichuan": (AutoModelForCausalLM, AutoTokenizer),
     "auto": (AutoModelForCausalLM, AutoTokenizer),
 }
diff --git a/inference_multigpu_demo.py b/inference_multigpu_demo.py
index db44f0b..2b2a391 100644
--- a/inference_multigpu_demo.py
+++ b/inference_multigpu_demo.py
@@ -23,7 +23,6 @@
     AutoTokenizer,
     BloomForCausalLM,
     BloomTokenizerFast,
-    LlamaTokenizer,
     LlamaForCausalLM,
     GenerationConfig,
     BitsAndBytesConfig,
@@ -34,7 +33,7 @@
 MODEL_CLASSES = {
     "bloom": (BloomForCausalLM, BloomTokenizerFast),
     "chatglm": (AutoModel, AutoTokenizer),
-    "llama": (LlamaForCausalLM, LlamaTokenizer),
+    "llama": (LlamaForCausalLM, AutoTokenizer),
     "baichuan": (AutoModelForCausalLM, AutoTokenizer),
     "auto": (AutoModelForCausalLM, AutoTokenizer),
 }
diff --git a/merge_peft_adapter.py b/merge_peft_adapter.py
index b6692aa..b58b8ae 100644
--- a/merge_peft_adapter.py
+++ b/merge_peft_adapter.py
@@ -22,7 +22,6 @@
     BloomForCausalLM,
     BloomTokenizerFast,
     AutoModelForCausalLM,
-    LlamaTokenizer,
     LlamaForCausalLM,
     AutoModelForSequenceClassification,
 )
@@ -30,7 +29,7 @@
 MODEL_CLASSES = {
     "bloom": (BloomForCausalLM, BloomTokenizerFast),
     "chatglm": (AutoModel, AutoTokenizer),
-    "llama": (LlamaForCausalLM, LlamaTokenizer),
+    "llama": (LlamaForCausalLM, AutoTokenizer),
     "baichuan": (AutoModelForCausalLM, AutoTokenizer),
     "auto": (AutoModelForCausalLM, AutoTokenizer),
 }
diff --git a/orpo_training.py b/orpo_training.py
index 0b960f1..d163f0b 100644
--- a/orpo_training.py
+++ b/orpo_training.py
@@ -17,7 +17,6 @@
     BloomForCausalLM,
     AutoModelForCausalLM,
     AutoModel,
-    LlamaTokenizer,
     LlamaForCausalLM,
     BloomTokenizerFast,
     AutoTokenizer,
diff --git a/ppo_training.py b/ppo_training.py
index f35bd0c..a554786 100644
--- a/ppo_training.py
+++ b/ppo_training.py
@@ -20,7 +20,6 @@
     BloomForCausalLM,
     AutoModelForCausalLM,
     AutoModel,
-    LlamaTokenizer,
     LlamaForCausalLM,
     BloomTokenizerFast,
     AutoTokenizer,
diff --git a/pretraining.py b/pretraining.py
index 353d326..a5d29a4 100644
--- a/pretraining.py
+++ b/pretraining.py
@@ -35,7 +35,6 @@
     BloomForCausalLM,
     AutoModelForCausalLM,
     AutoModel,
-    LlamaTokenizer,
     LlamaForCausalLM,
     BloomTokenizerFast,
     AutoTokenizer,
diff --git a/reward_modeling.py b/reward_modeling.py
index fc7a212..114442d 100644
--- a/reward_modeling.py
+++ b/reward_modeling.py
@@ -21,7 +21,6 @@
     PreTrainedTokenizerBase,
     BloomForSequenceClassification,
     LlamaForSequenceClassification,
-    LlamaTokenizer,
     BloomTokenizerFast,
     AlbertForSequenceClassification,
     BertForSequenceClassification,
@@ -44,7 +43,7 @@
     "roberta": (AutoConfig, RobertaForSequenceClassification, RobertaTokenizer),
     "albert": (AutoConfig, AlbertForSequenceClassification, AutoTokenizer),
     "bloom": (AutoConfig, BloomForSequenceClassification, BloomTokenizerFast),
-    "llama": (AutoConfig, LlamaForSequenceClassification, LlamaTokenizer),
+    "llama": (AutoConfig, LlamaForSequenceClassification, AutoTokenizer),
     "auto": (AutoConfig, AutoModelForSequenceClassification, AutoTokenizer),
 }
 
diff --git a/supervised_finetuning.py b/supervised_finetuning.py
index 0419994..9656910 100644
--- a/supervised_finetuning.py
+++ b/supervised_finetuning.py
@@ -35,7 +35,6 @@
     BloomForCausalLM,
     AutoModel,
     AutoModelForCausalLM,
-    LlamaTokenizer,
     LlamaForCausalLM,
     BloomTokenizerFast,
     AutoTokenizer,