diff --git a/controllers/auth_grpc.go b/controllers/auth_grpc.go
index 679f3811..5cd21514 100644
--- a/controllers/auth_grpc.go
+++ b/controllers/auth_grpc.go
@@ -106,7 +106,7 @@ func grpcAuthorize(ctx context.Context) error {
 // Login - node authenticates using its password and retrieves a JWT for authorization.
 func (s *NodeServiceServer) Login(ctx context.Context, req *nodepb.Object) (*nodepb.Object, error) {
 
-	var reqNode, err = getNewOrLegacyNode(req.Data)
+	var reqNode, err = getNodeFromRequestData(req.Data)
 	if err != nil {
 		return nil, err
 	}
diff --git a/controllers/node_grpc.go b/controllers/node_grpc.go
index 4aed4c2b..ac47e5d6 100644
--- a/controllers/node_grpc.go
+++ b/controllers/node_grpc.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"strings"
 	"time"
 
 	nodepb "github.com/gravitl/netmaker/grpc"
@@ -22,7 +21,7 @@ type NodeServiceServer struct {
 
 // NodeServiceServer.ReadNode - reads node and responds with gRPC
 func (s *NodeServiceServer) ReadNode(ctx context.Context, req *nodepb.Object) (*nodepb.Object, error) {
-	var node, err = getNewOrLegacyNode(req.Data)
+	var node, err = getNodeFromRequestData(req.Data)
 	if err != nil {
 		return nil, err
 	}
@@ -177,7 +176,7 @@ func getServerAddrs(node *models.Node) {
 // NodeServiceServer.DeleteNode - deletes a node and responds over gRPC
 func (s *NodeServiceServer) DeleteNode(ctx context.Context, req *nodepb.Object) (*nodepb.Object, error) {
 
-	var node, err = getNewOrLegacyNode(req.Data)
+	var node, err = getNodeFromRequestData(req.Data)
 	if err != nil {
 		return nil, err
 	}
@@ -197,7 +196,7 @@ func (s *NodeServiceServer) DeleteNode(ctx context.Context, req *nodepb.Object)
 // NodeServiceServer.GetPeers - fetches peers over gRPC
 func (s *NodeServiceServer) GetPeers(ctx context.Context, req *nodepb.Object) (*nodepb.Object, error) {
 
-	var node, err = getNewOrLegacyNode(req.Data)
+	var node, err = getNodeFromRequestData(req.Data)
 	if err != nil {
 		return nil, err
 	}
@@ -223,7 +222,7 @@ func (s *NodeServiceServer) GetPeers(ctx context.Context, req *nodepb.Object) (*
 // NodeServiceServer.GetExtPeers - returns ext peers for a gateway node
 func (s *NodeServiceServer) GetExtPeers(ctx context.Context, req *nodepb.Object) (*nodepb.Object, error) {
 
-	var node, err = getNewOrLegacyNode(req.Data)
+	var node, err = getNodeFromRequestData(req.Data)
 	if err != nil {
 		return nil, err
 	}
@@ -257,7 +256,7 @@ func (s *NodeServiceServer) GetExtPeers(ctx context.Context, req *nodepb.Object)
 }
 
 // == private methods ==
-
+/*
 func getNewOrLegacyNode(data string) (models.Node, error) {
 	var reqNode, node models.Node
 	var err error
@@ -279,6 +278,16 @@ func getNewOrLegacyNode(data string) (models.Node, error) {
 	}
 	return node, nil
 }
+*/
+func getNodeFromRequestData(data string) (models.Node, error) {
+	var reqNode models.Node
+	var err error
+
+	if err = json.Unmarshal([]byte(data), &reqNode); err != nil {
+		return models.Node{}, err
+	}
+	return logic.GetNodeByID(reqNode.ID)
+}
 
 func isServer(node *models.Node) bool {
 	return node.IsServer == "yes"
diff --git a/netclient/functions/daemon.go b/netclient/functions/daemon.go
index a57740c3..1a078303 100644
--- a/netclient/functions/daemon.go
+++ b/netclient/functions/daemon.go
@@ -547,6 +547,7 @@ func publish(cfg *config.ClientConfig, dest string, msg []byte) error {
 }
 
 func parseNetworkFromTopic(topic string) string {
+	log.Println("DELETE ME: topic - " + topic)
 	return strings.Split(topic, "/")[1]
 }