--- a/src/org/eclipse/jetty/io/AsyncEndPoint.java	Mon Oct 10 00:50:06 2016 -0600
+++ b/src/org/eclipse/jetty/io/AsyncEndPoint.java	Tue Oct 11 00:13:30 2016 -0600
@@ -18,66 +18,55 @@
 
 package org.eclipse.jetty.io;
 
-import org.eclipse.jetty.util.thread.Timeout;
 
 public interface AsyncEndPoint extends ConnectedEndPoint
 {
-    /* ------------------------------------------------------------ */
-    /**
-     * Dispatch the endpoint if it is not already dispatched
-     * 
-     */
-    public void dispatch();
-    
-    /* ------------------------------------------------------------ */
-    /**
-     * Dispatch the endpoint. If it is already dispatched, schedule a redispatch
-     * 
-     */
-    public void asyncDispatch();
-    
-    /* ------------------------------------------------------------ */
-    /** Schedule a write dispatch.
-     * Set the endpoint to not be writable and schedule a dispatch when
-     * it becomes writable.
-     */
-    public void scheduleWrite();  
-
-    /* ------------------------------------------------------------ */
-    /** Callback when idle.
-     * <p>An endpoint is idle if there has been no IO activity for 
-     * {@link #getMaxIdleTime()} and {@link #isCheckForIdle()} is true.
-     * @param idleForMs TODO
-     */
-    public void onIdleExpired(long idleForMs);
+	/* ------------------------------------------------------------ */
+	/**
+	 * Dispatch the endpoint if it is not already dispatched
+	 * 
+	 */
+	public void dispatch();
+	
+	/* ------------------------------------------------------------ */
+	/**
+	 * Dispatch the endpoint. If it is already dispatched, schedule a redispatch
+	 * 
+	 */
+	public void asyncDispatch();
+	
+	/* ------------------------------------------------------------ */
+	/** Schedule a write dispatch.
+	 * Set the endpoint to not be writable and schedule a dispatch when
+	 * it becomes writable.
+	 */
+	public void scheduleWrite();  
 
-    /* ------------------------------------------------------------ */
-    /** Set if the endpoint should be checked for idleness
-     */
-    public void setCheckForIdle(boolean check);
+	/* ------------------------------------------------------------ */
+	/** Callback when idle.
+	 * <p>An endpoint is idle if there has been no IO activity for 
+	 * {@link #getMaxIdleTime()} and {@link #isCheckForIdle()} is true.
+	 * @param idleForMs TODO
+	 */
+	public void onIdleExpired(long idleForMs);
 
-    /* ------------------------------------------------------------ */
-    /** Get if the endpoint should be checked for idleness
-     */
-    public boolean isCheckForIdle();
-
-    
-    /* ------------------------------------------------------------ */
-    public boolean isWritable();
+	/* ------------------------------------------------------------ */
+	/** Set if the endpoint should be checked for idleness
+	 */
+	public void setCheckForIdle(boolean check);
 
-    /* ------------------------------------------------------------ */
-    /**
-     * @return True if IO has been successfully performed since the last call to {@link #hasProgressed()}
-     */
-    public boolean hasProgressed();
-    
-    /* ------------------------------------------------------------ */
-    /**
-     */
-    public void scheduleTimeout(Timeout.Task task, long timeoutMs);
+	/* ------------------------------------------------------------ */
+	/** Get if the endpoint should be checked for idleness
+	 */
+	public boolean isCheckForIdle();
 
-    /* ------------------------------------------------------------ */
-    /**
-     */
-    public void cancelTimeout(Timeout.Task task);
+	
+	/* ------------------------------------------------------------ */
+	public boolean isWritable();
+
+	/* ------------------------------------------------------------ */
+	/**
+	 * @return True if IO has been successfully performed since the last call to {@link #hasProgressed()}
+	 */
+	public boolean hasProgressed();
 }