diff --git a/nucleus/cli-handling.go b/nucleus/cli-handling.go
index 6ad6b730ba741c6a12dc55be59a2183e39c3bd15..f72824f99135feb9bb5fe26afa2f318a7150afd6 100644
--- a/nucleus/cli-handling.go
+++ b/nucleus/cli-handling.go
@@ -39,7 +39,6 @@ type server struct {
 	pb.UnimplementedGrpcCliServer
 	core           *Core
 	logConnections []*logConnection
-	devices        map[uuid.UUID]Device
 }
 
 var srv *server
@@ -262,7 +261,7 @@ func (s *server) AddDevice(ctx context.Context, in *pb.AddDeviceRequest) (*pb.Ad
 	return &pb.AddDeviceReply{Message: "Added new Device: " + newDevice.Config.Uuid.String()}, err
 }
 
-// HandleDeviceGetRequest handles a GET request via newPnd.Request()
+// HandleDeviceGetRequest handles a GET request via pnd.Request()
 func (s *server) HandleDeviceGetRequest(ctx context.Context, in *pb.DeviceGetRequest) (*pb.DeviceGetReply, error) {
 	log.Info("Received: HandleDeviceGetRequest")
 	uuidPND, err := uuid.Parse(in.GetUuidPND())