1 files changed, 5 insertions, 10 deletions

diff --git a/configd/src/apps/cmd/main.cpp b/configd/src/apps/cmd/main.cpp
index e448fff1c6d..53edaf80dba 100644
--- a/configd/src/apps/cmd/main.cpp
+++ b/configd/src/apps/cmd/main.cpp
@@ -15,11 +15,10 @@ class Cmd
 {
 private:
     std::unique_ptr<fnet::frt::StandaloneFRT> _server;
-    FRT_Supervisor *_supervisor;
     FRT_Target *_target;
 
 public:
-    Cmd() : _supervisor(), _target(nullptr) {}
+    Cmd() : _server(), _target(nullptr) {}
     ~Cmd();
     int run(const char *cmd, const char *arg);
     void initRPC(const char *spec);
@@ -28,7 +27,7 @@ public:
 
 Cmd::~Cmd()
 {
-    LOG_ASSERT(! _supervisor);
+    LOG_ASSERT(! _server);
     LOG_ASSERT(_target == nullptr);
 }
 
@@ -46,8 +45,7 @@ void
 Cmd::initRPC(const char *spec)
 {
     _server = std::make_unique<fnet::frt::StandaloneFRT>();
-    _supervisor = & _server->supervisor();
-    _target     = _supervisor->GetTarget(spec);
+    _target     = _server->supervisor().GetTarget(spec);
 }
 
 
@@ -58,10 +56,7 @@ Cmd::finiRPC()
         _target->SubRef();
         _target = nullptr;
     }
-    if (_server) {
-        _server.reset();
-        _supervisor = nullptr;
-    }
+    _server.reset();
 }
 
 
@@ -71,7 +66,7 @@ Cmd::run(const char *cmd, const char *arg)
     int retval = 0;
     initRPC("tcp/localhost:19097");
 
-    FRT_RPCRequest *req = _supervisor->AllocRPCRequest();
+    FRT_RPCRequest *req = _server->supervisor().AllocRPCRequest();
     req->SetMethodName(cmd);
 
     if (arg) {