diff --git a/src/sonic_ax_impl/mibs/__init__.py b/src/sonic_ax_impl/mibs/__init__.py
index 0e91c6295..f3bc42401 100644
--- a/src/sonic_ax_impl/mibs/__init__.py
+++ b/src/sonic_ax_impl/mibs/__init__.py
@@ -570,26 +570,20 @@ def init_namespace_sync_d_queue_tables(dbs):
         return port_queues_map, queue_stat_map, port_queue_list_map
 
     @staticmethod
-    def get_bridge_port_map_from_namespace_dbs(all_ns_db, db_name):
+    def get_bridge_port_map_from_namespace_dbs(dbs, db_name):
         """
         get_bridge_port_map from all namespace DBs
         """
         if_br_oid_map = {}
-        if len(all_ns_db) == 1:
-            if_br_oid_map = port_util.get_bridge_port_map(all_ns_db[0])
-        else:
-            for db_conn in all_ns_db[1:]:
-                if_br_oid_map_ns = port_util.get_bridge_port_map(db_conn)
-                if_br_oid_map.update(if_br_oid_map_ns)
+        for db_conn in Namespace.get_non_host_dbs(dbs):
+            if_br_oid_map_ns = port_util.get_bridge_port_map(db_conn)
+            if_br_oid_map.update(if_br_oid_map_ns)
         return if_br_oid_map
 
     @staticmethod
-    def get_vlan_id_from_bvid_from_namespace_dbs(all_ns_db, bvid):
-        if len(all_ns_db) == 1:
-            return port_util.get_vlan_id_from_bvid(all_ns_db[0], bvid)
-        else:
-            for db_conn in all_ns_db[1:]:
-                db_conn.connect('ASIC_DB')
-                vlan_obj = db.keys('ASIC_DB', "ASIC_STATE:SAI_OBJECT_TYPE_VLAN:" + bvid)
-                if vlan_obj is not None:
-                    return port_util.get_vlan_id_from_bvid(db_conn, bvid)
+    def get_vlan_id_from_bvid_from_namespace_dbs(dbs, bvid):
+        for db_conn in Namespace.get_non_host_dbs(dbs):
+            db_conn.connect('ASIC_DB')
+            vlan_obj = db.keys('ASIC_DB', "ASIC_STATE:SAI_OBJECT_TYPE_VLAN:" + bvid)
+            if vlan_obj is not None:
+                return port_util.get_vlan_id_from_bvid(db_conn, bvid)
diff --git a/src/sonic_ax_impl/mibs/ietf/rfc2737.py b/src/sonic_ax_impl/mibs/ietf/rfc2737.py
index 77578b9c9..04f0de1d3 100644
--- a/src/sonic_ax_impl/mibs/ietf/rfc2737.py
+++ b/src/sonic_ax_impl/mibs/ietf/rfc2737.py
@@ -11,8 +11,6 @@
 from sonic_ax_impl import mibs
 from sonic_ax_impl.mibs import Namespace
 
-import threading
-
 @unique
 class PhysicalClass(int, Enum):
     """
diff --git a/src/sonic_ax_impl/mibs/ietf/rfc3433.py b/src/sonic_ax_impl/mibs/ietf/rfc3433.py
index 3baf9da1d..1a46a232c 100644
--- a/src/sonic_ax_impl/mibs/ietf/rfc3433.py
+++ b/src/sonic_ax_impl/mibs/ietf/rfc3433.py
@@ -5,7 +5,7 @@
 from enum import Enum, unique
 from bisect import bisect_right
 
-from swsssdk import SonicV2Connector, port_util
+from swsssdk import port_util
 from ax_interface import MIBMeta, MIBUpdater, ValueType, SubtreeMIBEntry
 from sonic_ax_impl import mibs
 from sonic_ax_impl.mibs import Namespace
diff --git a/src/sonic_ax_impl/mibs/ietf/rfc4363.py b/src/sonic_ax_impl/mibs/ietf/rfc4363.py
index b4c4d269c..f4ae12db1 100644
--- a/src/sonic_ax_impl/mibs/ietf/rfc4363.py
+++ b/src/sonic_ax_impl/mibs/ietf/rfc4363.py
@@ -1,9 +1,7 @@
 import json
-from enum import unique, Enum
 
 from sonic_ax_impl import mibs
 from sonic_ax_impl.mibs import Namespace
-from swsssdk import port_util
 from ax_interface import MIBMeta, ValueType, MIBUpdater, SubtreeMIBEntry
 from ax_interface.util import mac_decimals
 from bisect import bisect_right