diff --git a/targets/simple_switch_grpc/switch_runner.cpp b/targets/simple_switch_grpc/switch_runner.cpp
index 8fea74d0a..e1f9d8cd9 100644
--- a/targets/simple_switch_grpc/switch_runner.cpp
+++ b/targets/simple_switch_grpc/switch_runner.cpp
@@ -25,7 +25,6 @@
 
 #include <bm/PI/pi.h>
 
-#include <PI/frontends/proto/device_mgr.h>
 #include <PI/frontends/proto/logging.h>
 
 #include <PI/proto/pi_server.h>
@@ -64,8 +63,6 @@ namespace sswitch_runtime {
 
 namespace sswitch_grpc {
 
-using pi::fe::proto::DeviceMgr;
-
 using grpc::ServerContext;
 using grpc::Status;
 using grpc::StatusCode;
@@ -506,7 +503,7 @@ SimpleSwitchGrpcRunner::SimpleSwitchGrpcRunner(
       dp_grpc_server_addr(dp_grpc_server_addr),
       dp_service(nullptr),
       dp_grpc_server(nullptr) {
-  DeviceMgr::init();
+  PIGrpcServerInit();
 }
 
 int
@@ -680,7 +677,6 @@ SimpleSwitchGrpcRunner::is_dp_service_active() {
 
 SimpleSwitchGrpcRunner::~SimpleSwitchGrpcRunner() {
   PIGrpcServerCleanup();
-  DeviceMgr::destroy();
 }
 
 void