diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala
index 3daf1e19d1..038e3fc9f1 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala
@@ -52,7 +52,7 @@ class ActorTimeoutSpec extends AkkaSpec with BeforeAndAfterAll with DefaultTimeo
         val echo = actorWithTimeout(Props.defaultTimeout)
         val f = echo.?("hallo", testTimeout)
         try {
-          intercept[AskTimeoutException] { Await.result(f, testTimeout + testTimeout) }
+          intercept[AskTimeoutException] { Await.result(f, testTimeout + 300.millis) }
         } finally { system.stop(echo) }
       }
     }
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
index 861132b79c..3832d0b8fa 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -638,17 +638,6 @@ class RemoteServerHandler(
 
   import remoteSupport.serverSettings._
 
-  //Writes the specified message to the specified channel and propagates write errors to listeners
-  private def write(channel: Channel, payload: AkkaRemoteProtocol) {
-    channel.write(payload).addListener(
-      new ChannelFutureListener {
-        def operationComplete(future: ChannelFuture) {
-          if (!future.isCancelled && !future.isSuccess)
-            remoteSupport.notifyListeners(RemoteServerWriteFailed(payload, future.getCause, remoteSupport, getClientAddress(channel)))
-        }
-      })
-  }
-
   /**
    * ChannelOpen overridden to store open channels for a clean postStop of a node.
    * If a channel is closed before, it is automatically removed from the open channels group.