diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 5a0dfb6746..455421a38c 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -335,7 +335,7 @@ rpc_port: 9160
 # enable or disable keepalive on rpc connections
 rpc_keepalive: true
 
-# Cassandra provides three out-of-the-box options for the RPC Server:
+# Cassandra provides two out-of-the-box options for the RPC Server:
 #
 # sync  -> One thread per thrift connection. For a very large number of clients, memory
 #          will be your limiting factor. On a 64 bit JVM, 180KB is the minimum stack size
diff --git a/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java b/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java
index 25800a0db6..3c21d3a4fd 100644
--- a/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java
+++ b/src/java/org/apache/cassandra/thrift/TServerCustomFactory.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
 import org.apache.thrift.server.TServer;
 
 /**
- * Helper implementation to create a thrift TServer based on one of the common types we support (sync, async, hsha),
+ * Helper implementation to create a thrift TServer based on one of the common types we support (sync, hsha),
  * or a custom type by setting the fully qualified java class name in the rpc_server_type setting.
  */
 public class TServerCustomFactory implements TServerFactory