diff --git a/tf_adapter/tests/st/util/testcase/ge_plugin_test.cc b/tf_adapter/tests/st/util/testcase/ge_plugin_test.cc
index c1828be93f6ee2018a072a0b5feac7cfbe1d9720..259014031c235ec055d3b17d553b7c5c20ec35fa 100644
--- a/tf_adapter/tests/st/util/testcase/ge_plugin_test.cc
+++ b/tf_adapter/tests/st/util/testcase/ge_plugin_test.cc
@@ -12,6 +12,7 @@ class GePluginTest : public testing::Test {
 };
 
 TEST_F(GePluginTest, PluginInitTest) {
+  PluginFinalize();
   std::map<std::string, std::string> init_options;
   setenv("JOB_ID", "1000", true);
   setenv("RANK_SIZE", "1", true);
@@ -33,6 +34,7 @@ TEST_F(GePluginTest, PluginInitTest) {
 }
 
 TEST_F(GePluginTest, PluginInitTest_Success) {
+  PluginFinalize();
   std::map<std::string, std::string> init_options;
   setenv("JOB_ID", "1000", true);
   setenv("RANK_SIZE", "1", true);
@@ -54,6 +56,7 @@ TEST_F(GePluginTest, PluginInitTest_Success) {
 }
 
 TEST_F(GePluginTest, PluginInitTest_fail) {
+  PluginFinalize();
   std::map<std::string, std::string> init_options;
   setenv("JOB_ID", "1000", true);
   setenv("CM_WORK_SIZE", "1", true);
@@ -77,6 +80,7 @@ TEST_F(GePluginTest, PluginInitTest_fail) {
 }
 
 TEST_F(GePluginTest, PluginInitTest_hccl) {
+  PluginFinalize();
   std::map<std::string, std::string> init_options;
   unsetenv("RANK_SIZE");
   unsetenv("RANK_TABLE_FILE");
diff --git a/tf_adapter/tests/ut/util/testcase/ge_plugin_test.cc b/tf_adapter/tests/ut/util/testcase/ge_plugin_test.cc
index 4f41877d683164619b0bb7e28fb91aa54da455b4..aa2374b4572d9dd7393f58bf359b9c0fc39a56ec 100644
--- a/tf_adapter/tests/ut/util/testcase/ge_plugin_test.cc
+++ b/tf_adapter/tests/ut/util/testcase/ge_plugin_test.cc
@@ -50,6 +50,7 @@ TEST_F(GePluginTest, PluginInitTest_Success) {
 }
 
 TEST_F(GePluginTest, PluginInitTest) {
+  PluginFinalize();
   std::map<std::string, std::string> init_options;
   setenv("JOB_ID", "1000", true);
   setenv("RANK_SIZE", "1", true);
diff --git a/tf_adapter/util/ge_plugin.cc b/tf_adapter/util/ge_plugin.cc
index d5dcfc4fc97b5876a2f4fdaff110882f3e69bede..7a3f2a201605567cd57dd3420a53995ae125d851 100644
--- a/tf_adapter/util/ge_plugin.cc
+++ b/tf_adapter/util/ge_plugin.cc
@@ -233,7 +233,6 @@ void GePlugin::Init(std::map<std::string, std::string> &init_options, const bool
   }
 
   init_options[ge::OPTION_EXEC_IS_USEHCOM] = std::to_string(is_use_hcom);
-  init_options[ge::OPTION_EXEC_DEPLOY_MODE] = std::to_string(deploy_mode);
 
   // is use hcom configuration
   ADP_LOG(INFO) << "[GePlugin] is_usehcom : " << init_options[ge::OPTION_EXEC_IS_USEHCOM]
@@ -360,19 +359,13 @@ void GePlugin::SetRankTableFileEnv(std::map<std::string, std::string> &init_opti
     std::string env_pod_name;
     (void) ReadStringFromEnvVar("POD_NAME", "", &env_pod_name);
     if (!env_pod_name.empty()) {
-      deploy_mode = true;
       init_options[ge::OPTION_EXEC_POD_NAME] = env_pod_name;
-    } else {
-      std::string env_rank_id;
-      (void) ReadStringFromEnvVar("RANK_ID", "", &env_rank_id);
-      if (!env_rank_id.empty()) {
-        ADP_LOG(INFO) << "[GePlugin] env RANK_ID:" << env_rank_id;
-        deploy_mode = false;
-        init_options[ge::OPTION_EXEC_RANK_ID] = env_rank_id;
-      } else {
-        ADP_LOG(ERROR) << "[GePlugin] Can't find rank_id or pod_name in env.";
-        LOG(ERROR) << "[GePlugin] Can't find rank_id or pod_name in env.";
-      }
+    }
+    std::string env_rank_id;
+    (void) ReadStringFromEnvVar("RANK_ID", "", &env_rank_id);
+    if (!env_rank_id.empty()) {
+      ADP_LOG(INFO) << "[GePlugin] env RANK_ID:" << env_rank_id;
+      init_options[ge::OPTION_EXEC_RANK_ID] = env_rank_id;
     }
   }
 }