diff --git a/common/dbinterface.h b/common/dbinterface.h
index 12a249578..80b7037bf 100644
--- a/common/dbinterface.h
+++ b/common/dbinterface.h
@@ -5,7 +5,6 @@
 #include <stdexcept>
 
 #include "dbconnector.h"
-#include "redisclient.h"
 #include "logger.h"
 
 namespace swss
diff --git a/common/logger.cpp b/common/logger.cpp
index bb2a99ed1..965d4f85e 100644
--- a/common/logger.cpp
+++ b/common/logger.cpp
@@ -11,7 +11,6 @@
 #include "schema.h"
 #include "select.h"
 #include "dbconnector.h"
-#include "redisclient.h"
 #include "consumerstatetable.h"
 #include "producerstatetable.h"
 
diff --git a/common/loglevel.cpp b/common/loglevel.cpp
index 6ae85af63..1be85c099 100644
--- a/common/loglevel.cpp
+++ b/common/loglevel.cpp
@@ -7,7 +7,6 @@
 #include "schema.h"
 #include "logger.h"
 #include "dbconnector.h"
-#include "redisclient.h"
 #include "producerstatetable.h"
 
 using namespace swss;
diff --git a/common/redisclient.h b/common/redisclient.h
index 5494f24cc..59282a310 100644
--- a/common/redisclient.h
+++ b/common/redisclient.h
@@ -60,10 +60,8 @@ class RedisClient
 
     private:
         swss::DBConnector *m_db;
-};
-
-// TODO: mark above class: __attribute__ ((__deprecated__));
-// After remove all the caller code
+} __attribute__ ((__deprecated__));
+// This class is deprecated. Please use DBConnector class instead.
 
 }
 
diff --git a/tests/fdb_flush.cpp b/tests/fdb_flush.cpp
index cab2225ab..7ba981c0d 100644
--- a/tests/fdb_flush.cpp
+++ b/tests/fdb_flush.cpp
@@ -4,7 +4,6 @@
 #include "common/producertable.h"
 #include "common/consumertable.h"
 #include "common/redisapi.h"
-#include "common/redisclient.h"
 
 #include <inttypes.h>
 #include <iostream>
diff --git a/tests/logger_ut.cpp b/tests/logger_ut.cpp
index 65203e4e1..c17c9c262 100644
--- a/tests/logger_ut.cpp
+++ b/tests/logger_ut.cpp
@@ -1,5 +1,4 @@
 #include "common/dbconnector.h"
-#include "common/redisclient.h"
 #include "common/producerstatetable.h"
 #include "common/consumerstatetable.h"
 #include "common/select.h"
diff --git a/tests/redis_state_ut.cpp b/tests/redis_state_ut.cpp
index 5ec353870..d14d8f915 100644
--- a/tests/redis_state_ut.cpp
+++ b/tests/redis_state_ut.cpp
@@ -11,7 +11,6 @@
 #include "common/table.h"
 #include "common/producerstatetable.h"
 #include "common/consumerstatetable.h"
-#include "common/redisclient.h"
 
 using namespace std;
 using namespace swss;
diff --git a/tests/redis_ut.cpp b/tests/redis_ut.cpp
index 9d8becf00..03a7e1e6e 100644
--- a/tests/redis_ut.cpp
+++ b/tests/redis_ut.cpp
@@ -12,7 +12,6 @@
 #include "common/selectableevent.h"
 #include "common/selectabletimer.h"
 #include "common/table.h"
-#include "common/redisclient.h"
 #include "common/dbinterface.h"
 #include "common/sonicv2connector.h"