diff --git a/pytorch_blade/src/compiler/mlir/converters/torch_mlir_op_filter.cpp b/pytorch_blade/src/compiler/mlir/converters/torch_mlir_op_filter.cpp
index ed610eac86a..89cc96c98cc 100644
--- a/pytorch_blade/src/compiler/mlir/converters/torch_mlir_op_filter.cpp
+++ b/pytorch_blade/src/compiler/mlir/converters/torch_mlir_op_filter.cpp
@@ -37,8 +37,8 @@ bool IsTorchMlirSupported(const torch::jit::Node& node) {
 }
 
 // clang-format off
-const std::unordered_set<std::string> &GetTorchMlirWhiteList() {
-  static std::unordered_set<std::string> white_list{
+std::unordered_set<std::string> CreateTorchMlirWhiteList() {
+  std::unordered_set<std::string> white_list{
       "aten::_autocast_to_reduced_precision",
       "aten::__and__",
       "aten::add",
@@ -113,24 +113,26 @@ const std::unordered_set<std::string> &GetTorchMlirWhiteList() {
       "torch_blade::fake_quant"
     };
 
+  auto custom_ops = env::ReadStringFromEnvVar("TORCH_MHLO_OP_WHITE_LIST", "");
+  std::ostringstream ostr;
+  ostr << "User defined white list: [";
+  std::istringstream f(custom_ops);
+  std::string s;
+  for (auto s : StrSplit(custom_ops, ';')) {
+    white_list.insert(std::string(s));
+    ostr << s << ", ";
+  }
+  ostr << "]";
+  LOG(INFO) << ostr.str();
 
-  static std::once_flag white;
-  std::call_once(white, []() {
-      auto custom_ops = env::ReadStringFromEnvVar("TORCH_MHLO_OP_WHITE_LIST", "");
-      std::ostringstream ostr;
-      ostr << "User defined white list: [";
-      std::istringstream f(custom_ops);
-      std::string s;
-      for (auto s : StrSplit(custom_ops, ';')) {
-        white_list.insert(std::string(s));
-        ostr << s << ", ";
-      }
-      ostr << "]";
-      LOG(INFO) << ostr.str();
-  });
   return white_list;
 }
 // clang-format off
 
+const std::unordered_set<std::string> &GetTorchMlirWhiteList() {
+  static std::unordered_set<std::string> white_list = CreateTorchMlirWhiteList();
+  return white_list;
+}
+
 } //  namespace blade
 } //  namespace torch
diff --git a/pytorch_blade/src/compiler/mlir/runtime/disc_engine.cpp b/pytorch_blade/src/compiler/mlir/runtime/disc_engine.cpp
index 4b6b6c480be..cb21c4e44ec 100644
--- a/pytorch_blade/src/compiler/mlir/runtime/disc_engine.cpp
+++ b/pytorch_blade/src/compiler/mlir/runtime/disc_engine.cpp
@@ -99,16 +99,15 @@ const char* GetBackendName() {
   return DiscEngine::GetBackendName();
 }
 
+namespace {
 bool InitBladeDiscEngine() {
-  static std::once_flag flag;
-  std::call_once(flag, [&]() {
-    auto torch_blade_engine_creator =
-        torch::blade::backends::EngineCreatorRegister().RegisterBackend(
-            DiscEngine::GetBackendName(), &DiscEngine::Create);
-  });
+  torch::blade::backends::EngineCreatorRegister().RegisterBackend(
+      DiscEngine::GetBackendName(), &DiscEngine::Create);
   return true;
 }
 static bool init_dummy = InitBladeDiscEngine();
+} // namespace
+
 } // namespace disc
 } // namespace blade
 } // namespace torch
diff --git a/pytorch_blade/src/compiler/mlir/runtime/disc_engine.h b/pytorch_blade/src/compiler/mlir/runtime/disc_engine.h
index 588dda6f54f..1c723b0e3bc 100644
--- a/pytorch_blade/src/compiler/mlir/runtime/disc_engine.h
+++ b/pytorch_blade/src/compiler/mlir/runtime/disc_engine.h
@@ -15,7 +15,6 @@ namespace torch {
 namespace blade {
 namespace disc {
 const char* GetBackendName();
-bool InitBladeDiscEngine();
 } // namespace disc
 } // namespace blade
 } // namespace torch
diff --git a/pytorch_blade/src/ltc/disc_compiler/passes/register_disc_class.cpp b/pytorch_blade/src/ltc/disc_compiler/passes/register_disc_class.cpp
index 9d3f237381e..b3bf8a32687 100644
--- a/pytorch_blade/src/ltc/disc_compiler/passes/register_disc_class.cpp
+++ b/pytorch_blade/src/ltc/disc_compiler/passes/register_disc_class.cpp
@@ -125,7 +125,6 @@ void ReplaceDiscClass(
 std::vector<c10::IValue> RegisterDiscClass(
     const std::shared_ptr<Graph>& graph) {
   torch::blade::backends::InitTorchBladeEngine();
-  torch::blade::disc::InitBladeDiscEngine();
   std::vector<c10::IValue> disc_inputs;
   std::vector<torch::jit::Node*> disc_nodes;
   std::copy_if(