diff --git a/setup.py b/setup.py
index 52c1667d..1984fcc9 100644
--- a/setup.py
+++ b/setup.py
@@ -9,11 +9,6 @@
     'hiredis>=0.1.4'
 ]
 
-console_scripts={
-    'sonic-db-load = swsssdk:sonic_db_dump_load',
-    'sonic-db-dump = swsssdk:sonic_db_dump_load',
-}
-
 setup(
     name='swsssdk',
     version='2.0.1',
@@ -31,7 +26,12 @@
     extras_require={
         'high_perf': high_performance_deps
     },
-    entry_points={},
+    entry_points={
+        'console_scripts': [
+            'sonic-db-load = swsssdk:sonic_db_dump_load',
+            'sonic-db-dump = swsssdk:sonic_db_dump_load',
+        ],
+    },
     classifiers=[
         'Intended Audience :: Developers',
         'Operating System :: Linux',
diff --git a/src/swsssdk/__init__.py b/src/swsssdk/__init__.py
index c1360b21..98228602 100644
--- a/src/swsssdk/__init__.py
+++ b/src/swsssdk/__init__.py
@@ -1,20 +1,12 @@
 """
 Utility library for Switch-state Redis database access and syslog reporting.
 """
-import sys
 import logging
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 logger.addHandler(logging.NullHandler())
 
-if ('unittest' not in sys.modules.keys() and
-        'mockredis' not in sys.modules.keys() and
-        'mock' not in sys.modules.keys()):
-    msg = "sonic-py-swsssdk been deprecated, please switch to sonic-swss-common."
-    logger.exception(msg)
-    raise ImportError("sonic-py-swsssdk been deprecated, please switch to sonic-swss-common.")
-
 try:
     from .dbconnector import SonicDBConfig, SonicV2Connector
     from .configdb import ConfigDBConnector, ConfigDBPipeConnector
diff --git a/test/test_moduleLoad.py b/test/test_moduleLoad.py
index 6c0486a7..5f6c9e33 100644
--- a/test/test_moduleLoad.py
+++ b/test/test_moduleLoad.py
@@ -5,7 +5,7 @@
 sys.path.insert(0, os.path.join(modules_path, 'src'))
 
 from unittest import TestCase
-import subprocess
+
 
 class Test_load_sonic_db_config(TestCase):
     def test__db_map_attributes(self):
@@ -34,10 +34,3 @@ def test__dbConfig(self):
         for namespace in list(dbConfig.get_ns_list()):
             self.assertEqual(dbConfig.get_dbid('PFC_WD_DB', namespace), 5)
             self.assertEqual(dbConfig.get_dbid('APPL_DB', namespace), 0)
-
-def test_BlockUseSwsssdk():
-    # Import swsssdk will throw exception with deprecated message.
-    swsssdk_path = os.path.join(modules_path, 'src')
-    result = subprocess.run(["python", "-c", "import swsssdk;exit()"], capture_output=True, cwd=swsssdk_path)
-
-    assert "deprecated" in result.stderr.decode("utf-8")