diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServerInterface.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServerInterface.java
index cf2a8a7736c..fdbbb21dc81 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServerInterface.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServerInterface.java
@@ -34,13 +34,6 @@ import com.google.protobuf.Descriptors.MethodDescriptor;
 import com.google.protobuf.Message;
 import com.google.protobuf.ServiceException;
 
-/**
- * RpcServer Interface.
- * Start calls {@link #openServer()} and then {@link #startThreads()}.  Prefer {@link #start()}
- * and {@link #stop()}.  Only use {@link #openServer()} and {@link #startThreads()} if in a
- * situation where you could start getting requests though the server not up and fully
- * initiaalized.
- */
 @InterfaceAudience.Private
 public interface RpcServerInterface {
   void start();
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
index bd68db12f75..bab5babd834 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
@@ -711,7 +711,7 @@ public class MasterRpcServices extends RSRpcServices
 
   /**
    * Get list of TableDescriptors for requested tables.
-   * @param controller Unused (set to null).
+   * @param c Unused (set to null).
    * @param req GetTableDescriptorsRequest that contains:
    * - tableNames: requested tables, or if empty, all are requested
    * @return GetTableDescriptorsResponse
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 12ca0125c95..7089a01a702 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -332,8 +332,7 @@ public class HRegionServer extends HasThread implements
   /**
    * The server name the Master sees us as.  Its made from the hostname the
    * master passes us, port, and server startcode. Gets set after registration
-   * against  Master.  The hostname can differ from the hostname in {@link #isa}
-   * but usually doesn't if both servers resolve .
+   * against  Master.
    */
   protected ServerName serverName;