diff --git a/community/ssl/src/main/java/org/neo4j/ssl/HostnameVerificationEngineModification.java b/community/ssl/src/main/java/org/neo4j/ssl/ClientSideHostnameVerificationEngineModification.java
similarity index 91%
rename from community/ssl/src/main/java/org/neo4j/ssl/HostnameVerificationEngineModification.java
rename to community/ssl/src/main/java/org/neo4j/ssl/ClientSideHostnameVerificationEngineModification.java
index 4bc09f54d01ad..5a06797ff0602 100644
--- a/community/ssl/src/main/java/org/neo4j/ssl/HostnameVerificationEngineModification.java
+++ b/community/ssl/src/main/java/org/neo4j/ssl/ClientSideHostnameVerificationEngineModification.java
@@ -23,7 +23,10 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
 
-public class HostnameVerificationEngineModification implements Function<SSLEngine,SSLEngine>
+/**
+ * Client side modifier for SSLEngine to mandate hostname verification
+ */
+public class ClientSideHostnameVerificationEngineModification implements Function<SSLEngine,SSLEngine>
 {
     /**
      * Apply modifications to engine to enable hostname verification (client side only)
diff --git a/community/ssl/src/main/java/org/neo4j/ssl/OnConnectSslHandler.java b/community/ssl/src/main/java/org/neo4j/ssl/ClientSideOnConnectSslHandler.java
similarity index 94%
rename from community/ssl/src/main/java/org/neo4j/ssl/OnConnectSslHandler.java
rename to community/ssl/src/main/java/org/neo4j/ssl/ClientSideOnConnectSslHandler.java
index 177f65b0d9227..cf025b9c5dcca 100644
--- a/community/ssl/src/main/java/org/neo4j/ssl/OnConnectSslHandler.java
+++ b/community/ssl/src/main/java/org/neo4j/ssl/ClientSideOnConnectSslHandler.java
@@ -37,22 +37,22 @@
 import java.util.function.Function;
 import javax.net.ssl.SSLEngine;
 
-public class OnConnectSslHandler extends ChannelDuplexHandler
+public class ClientSideOnConnectSslHandler extends ChannelDuplexHandler
 {
     private final ChannelPipeline pipeline;
     private final SslContext sslContext;
     private final Collection<Function<SSLEngine,SSLEngine>> engineModifications;
 
-    OnConnectSslHandler( Channel channel, SslContext sslContext, boolean isClient, boolean verifyHostname, String[] tlsVersions )
+    ClientSideOnConnectSslHandler( Channel channel, SslContext sslContext, boolean verifyHostname, String[] tlsVersions )
     {
         this.pipeline = channel.pipeline();
         this.sslContext = sslContext;
 
         this.engineModifications = new ArrayList<>();
-        engineModifications.add( new EssentialEngineModifications( tlsVersions, isClient ) );
+        engineModifications.add( new EssentialEngineModifications( tlsVersions, true ) );
         if ( verifyHostname )
         {
-            engineModifications.add( new HostnameVerificationEngineModification() );
+            engineModifications.add( new ClientSideHostnameVerificationEngineModification() );
         }
     }
 
diff --git a/community/ssl/src/main/java/org/neo4j/ssl/SslPolicy.java b/community/ssl/src/main/java/org/neo4j/ssl/SslPolicy.java
index f689745428051..bbbaa5acfe0b8 100644
--- a/community/ssl/src/main/java/org/neo4j/ssl/SslPolicy.java
+++ b/community/ssl/src/main/java/org/neo4j/ssl/SslPolicy.java
@@ -35,7 +35,6 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.TrustManagerFactory;
-import javax.xml.bind.DatatypeConverter;
 
 import org.neo4j.logging.Log;
 import org.neo4j.logging.LogProvider;
@@ -55,7 +54,6 @@ public class SslPolicy
     private final SslProvider sslProvider;
 
     private final boolean verifyHostname;
-    private final LogProvider logProvider;
     private final Log log;
 
     public SslPolicy( PrivateKey privateKey, X509Certificate[] keyCertChain, List<String> tlsVersions, List<String> ciphers, ClientAuth clientAuth,
@@ -69,7 +67,6 @@ public SslPolicy( PrivateKey privateKey, X509Certificate[] keyCertChain, List<St
         this.trustManagerFactory = trustManagerFactory;
         this.sslProvider = sslProvider;
         this.verifyHostname = verifyHostname;
-        this.logProvider = logProvider;
         this.log = logProvider.getLog( SslPolicy.class );
     }
 
@@ -116,7 +113,7 @@ public ChannelHandler nettyServerHandler( Channel channel ) throws SSLException
         return nettyServerHandler( channel, nettyServerContext() );
     }
 
-    private ChannelHandler nettyServerHandler( Channel channel, SslContext sslContext ) throws SSLException
+    private ChannelHandler nettyServerHandler( Channel channel, SslContext sslContext )
     {
         SSLEngine sslEngine = sslContext.newEngine( channel.alloc() );
         return new SslHandler( sslEngine );
@@ -128,9 +125,9 @@ public ChannelHandler nettyClientHandler( Channel channel ) throws SSLException
         return nettyClientHandler( channel, nettyClientContext() );
     }
 
-    ChannelHandler nettyClientHandler( Channel channel, SslContext sslContext ) throws SSLException
+    ChannelHandler nettyClientHandler( Channel channel, SslContext sslContext )
     {
-        return new OnConnectSslHandler( channel, sslContext, true, verifyHostname, tlsVersions );
+        return new ClientSideOnConnectSslHandler( channel, sslContext, verifyHostname, tlsVersions );
     }
 
     public PrivateKey privateKey()
diff --git a/integrationtests/src/test/java/org/neo4j/ssl/SecureClient.java b/integrationtests/src/test/java/org/neo4j/ssl/SecureClient.java
index 46b64f1604e52..d50edf1e00aea 100644
--- a/integrationtests/src/test/java/org/neo4j/ssl/SecureClient.java
+++ b/integrationtests/src/test/java/org/neo4j/ssl/SecureClient.java
@@ -27,6 +27,7 @@
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.channel.ChannelInitializer;
@@ -49,7 +50,6 @@
 public class SecureClient
 {
     private Bootstrap bootstrap;
-    private ClientInitializer clientInitializer;
     private NioEventLoopGroup eventLoopGroup;
     private Channel channel;
     private Bucket bucket = new Bucket();
@@ -62,10 +62,9 @@ public class SecureClient
     public SecureClient( SslPolicy sslPolicy ) throws SSLException
     {
         eventLoopGroup = new NioEventLoopGroup();
-        clientInitializer = new ClientInitializer( sslPolicy, bucket );
         bootstrap = new Bootstrap().group( eventLoopGroup )
                 .channel( NioSocketChannel.class )
-                .handler( clientInitializer );
+                .handler( new ClientInitializer( sslPolicy, bucket ) );
     }
 
     public Future<Channel> sslHandshakeFuture()
@@ -132,13 +131,13 @@ static class Bucket extends SimpleChannelInboundHandler<ByteBuf>
         }
 
         @Override
-        protected void channelRead0( ChannelHandlerContext ctx, ByteBuf msg ) throws Exception
+        protected void channelRead0( ChannelHandlerContext ctx, ByteBuf msg )
         {
             collectedData.writeBytes( msg );
         }
 
         @Override
-        public void exceptionCaught( ChannelHandlerContext ctx, Throwable cause ) throws Exception
+        public void exceptionCaught( ChannelHandlerContext ctx, Throwable cause )
         {
         }
     }
@@ -157,13 +156,13 @@ public class ClientInitializer extends ChannelInitializer<SocketChannel>
         }
 
         @Override
-        protected void initChannel( SocketChannel channel ) throws Exception
+        protected void initChannel( SocketChannel channel )
         {
             ChannelPipeline pipeline = channel.pipeline();
 
-            OnConnectSslHandler onConnectSslHandler = (OnConnectSslHandler) sslPolicy.nettyClientHandler( channel, sslContext );
+            ChannelHandler clientOnConnectSslHandler = sslPolicy.nettyClientHandler( channel, sslContext );
 
-            pipeline.addLast( onConnectSslHandler );
+            pipeline.addLast( clientOnConnectSslHandler );
             pipeline.addLast( new ChannelInboundHandlerAdapter()
                 {
                     @Override