diff --git a/src/main/java/com/yelp/nrtsearch/server/grpc/NrtsearchClient.java b/src/main/java/com/yelp/nrtsearch/server/grpc/NrtsearchClient.java
index 9b2177f1f..c9583d03c 100644
--- a/src/main/java/com/yelp/nrtsearch/server/grpc/NrtsearchClient.java
+++ b/src/main/java/com/yelp/nrtsearch/server/grpc/NrtsearchClient.java
@@ -17,8 +17,6 @@
 
 import static com.yelp.nrtsearch.server.grpc.ReplicationServerClient.MAX_MESSAGE_BYTES_SIZE;
 
-import com.google.api.HttpBody;
-import com.google.protobuf.Empty;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.util.JsonFormat;
 import io.grpc.ManagedChannel;
@@ -410,28 +408,6 @@ public List<String> getIndices() {
         .collect(Collectors.toList());
   }
 
-  public void nodeInfo() {
-    NodeInfoResponse response = blockingStub.nodeInfo(NodeInfoRequest.newBuilder().build());
-    logger.info("Server returned node info: {}", response);
-  }
-
-  public void globalState() {
-    GlobalStateResponse response =
-        blockingStub.globalState(GlobalStateRequest.newBuilder().build());
-    logger.info("Server returned global state: {}", response);
-  }
-
-  public void metrics() {
-    HttpBody response = blockingStub.metrics(Empty.newBuilder().build());
-    String metrics = new String(response.getData().toByteArray());
-    logger.info("Server returned metrics:\n{}", metrics);
-  }
-
-  public void custom(CustomRequest request) {
-    CustomResponse response = blockingStub.custom(request);
-    logger.info("Server returned : {}", response);
-  }
-
   private FieldDefRequest getFieldDefRequest(String jsonStr) {
     logger.info(String.format("Converting fields %s to proto FieldDefRequest", jsonStr));
     FieldDefRequest.Builder fieldDefRequestBuilder = FieldDefRequest.newBuilder();
diff --git a/src/main/java/com/yelp/nrtsearch/tools/cli/CustomCommand.java b/src/main/java/com/yelp/nrtsearch/tools/cli/CustomCommand.java
index 1cf42710c..165f5c6af 100644
--- a/src/main/java/com/yelp/nrtsearch/tools/cli/CustomCommand.java
+++ b/src/main/java/com/yelp/nrtsearch/tools/cli/CustomCommand.java
@@ -16,8 +16,11 @@
 package com.yelp.nrtsearch.tools.cli;
 
 import com.yelp.nrtsearch.server.grpc.CustomRequest;
+import com.yelp.nrtsearch.server.grpc.CustomResponse;
 import com.yelp.nrtsearch.server.grpc.NrtsearchClient;
 import java.util.concurrent.Callable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 
 @CommandLine.Command(
@@ -25,6 +28,7 @@
     description = "Sends a custom command to endpoint registered by a plugin")
 public class CustomCommand implements Callable<Integer> {
   public static final String CUSTOM_COMMAND = "custom";
+  private static final Logger logger = LoggerFactory.getLogger(CustomCommand.class);
 
   @CommandLine.ParentCommand private NrtsearchClientCommand baseCmd;
 
@@ -42,8 +46,8 @@ public Integer call() throws Exception {
 
     NrtsearchClient client = baseCmd.getClient();
     try {
-      // Call the appropriate method to send the custom request
-      client.custom(requestBuilder.build());
+      CustomResponse response = client.getBlockingStub().custom(requestBuilder.build());
+      logger.info("Server returned : {}", response);
     } finally {
       client.shutdown();
     }
diff --git a/src/main/java/com/yelp/nrtsearch/tools/cli/GlobalStateCommand.java b/src/main/java/com/yelp/nrtsearch/tools/cli/GlobalStateCommand.java
index 77ac843a9..36ba8a523 100644
--- a/src/main/java/com/yelp/nrtsearch/tools/cli/GlobalStateCommand.java
+++ b/src/main/java/com/yelp/nrtsearch/tools/cli/GlobalStateCommand.java
@@ -15,8 +15,12 @@
  */
 package com.yelp.nrtsearch.tools.cli;
 
+import com.yelp.nrtsearch.server.grpc.GlobalStateRequest;
+import com.yelp.nrtsearch.server.grpc.GlobalStateResponse;
 import com.yelp.nrtsearch.server.grpc.NrtsearchClient;
 import java.util.concurrent.Callable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 
 @CommandLine.Command(
@@ -24,6 +28,7 @@
     description = "Get server global state")
 public class GlobalStateCommand implements Callable<Integer> {
   public static final String GLOBAL_STATE = "globalState";
+  private static final Logger logger = LoggerFactory.getLogger(GlobalStateCommand.class);
 
   @CommandLine.ParentCommand private NrtsearchClientCommand baseCmd;
 
@@ -31,8 +36,9 @@ public class GlobalStateCommand implements Callable<Integer> {
   public Integer call() throws Exception {
     NrtsearchClient client = baseCmd.getClient();
     try {
-      // Call the appropriate method to get global state
-      client.globalState();
+      GlobalStateResponse response =
+          client.getBlockingStub().globalState(GlobalStateRequest.newBuilder().build());
+      logger.info("Server returned global state: {}", response);
     } finally {
       client.shutdown();
     }
diff --git a/src/main/java/com/yelp/nrtsearch/tools/cli/MetricsCommand.java b/src/main/java/com/yelp/nrtsearch/tools/cli/MetricsCommand.java
index c073a1875..c7c79bf61 100644
--- a/src/main/java/com/yelp/nrtsearch/tools/cli/MetricsCommand.java
+++ b/src/main/java/com/yelp/nrtsearch/tools/cli/MetricsCommand.java
@@ -15,8 +15,12 @@
  */
 package com.yelp.nrtsearch.tools.cli;
 
+import com.google.api.HttpBody;
+import com.google.protobuf.Empty;
 import com.yelp.nrtsearch.server.grpc.NrtsearchClient;
 import java.util.concurrent.Callable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 
 @CommandLine.Command(
@@ -24,6 +28,7 @@
     description = "Get prometheus metrics for the server")
 public class MetricsCommand implements Callable<Integer> {
   public static final String METRICS = "metrics";
+  private static final Logger logger = LoggerFactory.getLogger(MetricsCommand.class);
 
   @CommandLine.ParentCommand private NrtsearchClientCommand baseCmd;
 
@@ -31,8 +36,9 @@ public class MetricsCommand implements Callable<Integer> {
   public Integer call() throws Exception {
     NrtsearchClient client = baseCmd.getClient();
     try {
-      // Call the appropriate method to get metrics
-      client.metrics();
+      HttpBody response = client.getBlockingStub().metrics(Empty.newBuilder().build());
+      String metrics = new String(response.getData().toByteArray());
+      logger.info("Server returned metrics:\n{}", metrics);
     } finally {
       client.shutdown();
     }
diff --git a/src/main/java/com/yelp/nrtsearch/tools/cli/NodeInfoCommand.java b/src/main/java/com/yelp/nrtsearch/tools/cli/NodeInfoCommand.java
index 7d0f66baa..5fa4cba5a 100644
--- a/src/main/java/com/yelp/nrtsearch/tools/cli/NodeInfoCommand.java
+++ b/src/main/java/com/yelp/nrtsearch/tools/cli/NodeInfoCommand.java
@@ -15,8 +15,12 @@
  */
 package com.yelp.nrtsearch.tools.cli;
 
+import com.yelp.nrtsearch.server.grpc.NodeInfoRequest;
+import com.yelp.nrtsearch.server.grpc.NodeInfoResponse;
 import com.yelp.nrtsearch.server.grpc.NrtsearchClient;
 import java.util.concurrent.Callable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 
 @CommandLine.Command(
@@ -24,6 +28,7 @@
     description = "Get node information for the server")
 public class NodeInfoCommand implements Callable<Integer> {
   public static final String NODE_INFO = "nodeInfo";
+  private static final Logger logger = LoggerFactory.getLogger(NodeInfoCommand.class);
 
   @CommandLine.ParentCommand private NrtsearchClientCommand baseCmd;
 
@@ -31,8 +36,9 @@ public class NodeInfoCommand implements Callable<Integer> {
   public Integer call() throws Exception {
     NrtsearchClient client = baseCmd.getClient();
     try {
-      // Call the appropriate method to get node information
-      client.nodeInfo();
+      NodeInfoResponse response =
+          client.getBlockingStub().nodeInfo(NodeInfoRequest.newBuilder().build());
+      logger.info("Server returned node info: {}", response);
     } finally {
       client.shutdown();
     }