--- a/src/org/eclipse/jetty/io/nio/SelectorManager.java	Tue Oct 11 00:34:19 2016 -0600
+++ b/src/org/eclipse/jetty/io/nio/SelectorManager.java	Tue Oct 11 00:41:39 2016 -0600
@@ -47,7 +47,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.eclipse.jetty.util.thread.Timeout;
-import org.eclipse.jetty.util.thread.Timeout.Task;
 
 
 /* ------------------------------------------------------------ */
@@ -498,11 +497,8 @@
 
 					// workout how long to wait in select
 					_timeout.setNow(now);
-					long to_next_timeout=_timeout.getTimeToNext();
 
 					long wait = _changes.size()==0?__IDLE_TICK:0L;
-					if (wait > 0 && to_next_timeout >= 0 && wait > to_next_timeout)
-						wait = to_next_timeout;
 
 					// If we should wait with a select
 					if (wait>0)
@@ -631,13 +627,6 @@
 
 				now=System.currentTimeMillis();
 				_timeout.setNow(now);
-				Task task = _timeout.expired();
-				while (task!=null)
-				{
-					if (task instanceof Runnable)
-						execute((Runnable)task);
-					task = _timeout.expired();
-				}
 
 				// Idle tick
 				if (now-_idleTick>__IDLE_TICK)
@@ -814,8 +803,6 @@
 					}
 				}
 
-
-				_timeout.cancelAll();
 				try
 				{
 					selector=_selector;