diff --git a/vertx-core/src/main/java/io/vertx/core/http/impl/Http1xServerConnection.java b/vertx-core/src/main/java/io/vertx/core/http/impl/Http1xServerConnection.java
index 9d0a3147cfa..6ca366df36a 100644
--- a/vertx-core/src/main/java/io/vertx/core/http/impl/Http1xServerConnection.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/impl/Http1xServerConnection.java
@@ -54,8 +54,6 @@
 import static io.vertx.core.spi.metrics.Metrics.*;
 
 /**
- *
- * This class is optimised for performance when used on the same event loop. However it can be used safely from other threads.
  * </p>
  * The connection maintains two fields for tracking requests:
  * <ul>
diff --git a/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientBase.java b/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientBase.java
index cea44a3080c..ccf76d156ea 100644
--- a/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientBase.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientBase.java
@@ -29,8 +29,6 @@
 import java.util.stream.Collectors;
 
 /**
- * This class is thread-safe.
- *
  * @author <a href="http://tfox.org">Tim Fox</a>
  */
 public class HttpClientBase implements MetricsProvider, Closeable {
diff --git a/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientImpl.java b/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientImpl.java
index 04bf8c8d6fb..e265f1ffc4b 100644
--- a/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientImpl.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientImpl.java
@@ -40,8 +40,6 @@
 import java.util.regex.Pattern;
 
 /**
- * This class is thread-safe.
- *
  * @author <a href="http://tfox.org">Tim Fox</a>
  */
 public class HttpClientImpl extends HttpClientBase implements HttpClientInternal, MetricsProvider {
diff --git a/vertx-core/src/main/java/io/vertx/core/http/impl/HttpServerImpl.java b/vertx-core/src/main/java/io/vertx/core/http/impl/HttpServerImpl.java
index a415912af9f..83a0743907f 100644
--- a/vertx-core/src/main/java/io/vertx/core/http/impl/HttpServerImpl.java
+++ b/vertx-core/src/main/java/io/vertx/core/http/impl/HttpServerImpl.java
@@ -30,8 +30,6 @@
 import java.util.stream.Collectors;
 
 /**
- * This class is thread-safe
- *
  * @author <a href="http://tfox.org">Tim Fox</a>
  */
 public class HttpServerImpl implements HttpServer, MetricsProvider {
diff --git a/vertx-core/src/main/java/io/vertx/core/net/impl/NetClientImpl.java b/vertx-core/src/main/java/io/vertx/core/net/impl/NetClientImpl.java
index 0233a518c57..bf6a4009125 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/impl/NetClientImpl.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/impl/NetClientImpl.java
@@ -43,9 +43,6 @@
 import java.util.function.Predicate;
 
 /**
- *
- * This class is thread-safe
- *
  * @author <a href="http://tfox.org">Tim Fox</a>
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  */
diff --git a/vertx-core/src/main/java/io/vertx/core/net/impl/NetServerImpl.java b/vertx-core/src/main/java/io/vertx/core/net/impl/NetServerImpl.java
index 87d08674934..04898d485eb 100644
--- a/vertx-core/src/main/java/io/vertx/core/net/impl/NetServerImpl.java
+++ b/vertx-core/src/main/java/io/vertx/core/net/impl/NetServerImpl.java
@@ -50,7 +50,7 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * Base class for TCP servers
+ * Vert.x TCP server
  *
  * @author <a href="http://tfox.org">Tim Fox</a>
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>