diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
index c754c54ecba..e4fdcee5b4c 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
@@ -21,7 +21,6 @@ public class AsyncHttpConnection extends AbstractHttpConnection implements Async
     private static final Logger LOG = Log.getLogger(AsyncHttpConnection.class);
     
     private boolean _requestComplete;
-    private int _status;
     private Buffer _requestContentChunk;
     private final AsyncEndPoint _asyncEndp;
     
@@ -45,28 +44,12 @@ public class AsyncHttpConnection extends AbstractHttpConnection implements Async
         try
         {
             boolean failed = false;
-
-            int loops=10000; // TODO remove this safety net
             
             // While we are making progress and have not changed connection
             while (progress && connection==this)
             {
                 LOG.debug("open={} more={} buffering={} progress={}",_endp.isOpen(),_parser.isMoreInBuffer(),_endp.isBufferingInput(),progress);
                 
-                if (loops--<0)
-                {
-                    System.err.println("LOOPING!!!");
-                    System.err.println(this);
-                    System.err.println(_endp);
-                    _endp.close();
-                }
-                else if (loops==10)
-                {
-                    LOG.setDebugEnabled(true);
-                    Log.getLogger(HttpParser.class).setDebugEnabled(true);
-                    Log.getLogger("org.eclipse.jetty.io.nio.ssl").setDebugEnabled(true);
-                }
-                
                 progress=false;
                 HttpExchange exchange=_exchange;
                 
diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java
index 07480e128d3..d282544e8e7 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java
@@ -162,8 +162,6 @@ public class WebSocketUpgradeTest
         int status = httpExchange.waitForDone();
         assertEquals(HttpExchange.STATUS_COMPLETED, status);
 
-        // System.err.println("results="+_results);
-
         assertEquals("serverWS.onConnect", _results.poll(1,TimeUnit.SECONDS));
         TestWebSocket serverWS = (TestWebSocket)_results.poll(1,TimeUnit.SECONDS);