diff --git a/src/events.c b/src/events.c
index b9463c3e..6e28fe65 100644
--- a/src/events.c
+++ b/src/events.c
@@ -995,23 +995,18 @@ EventsMain(void)
 	       count, pfds[0].fd, FD_ISSET(pfds[0].fd, &fdset), dt * 1e-3,
 	       time2 * 1e-3);
 
-	if (count == 0)
+	if (count <= 0)
+	   continue;		/* Timeout (or error) */
+
+	/* Excluding X fd */
+	for (i = 1; i < nfds; i++)
 	  {
-	     /* We can only get here by timeout in select */
-	     TimersRunExpired();
-	  }
-	else if (count > 0)
-	  {
-	     /* Excluding X fd */
-	     for (i = 1; i < nfds; i++)
+	     fd = pfds[i].fd;
+	     if ((fd >= 0) && (FD_ISSET(fd, &fdset)))
 	       {
-		  fd = pfds[i].fd;
-		  if ((fd >= 0) && (FD_ISSET(fd, &fdset)))
-		    {
-		       if (EDebug(EDBUG_TYPE_EVENTS))
-			  Eprintf("Event fd %d\n", i);
-		       pfds[i].handler();
-		    }
+		  if (EDebug(EDBUG_TYPE_EVENTS))
+		     Eprintf("Event fd %d\n", i);
+		  pfds[i].handler();
 	       }
 	  }
      }
diff --git a/src/timers.c b/src/timers.c
index fae2f532..0edc4d75 100644
--- a/src/timers.c
+++ b/src/timers.c
@@ -225,14 +225,6 @@ TimersRun(unsigned int t_ms)
    return tn;
 }
 
-unsigned int
-TimersRunExpired(void)
-{
-   if (!q_first)		/* I don't think this should ever happen but... */
-      return 0;
-   return TimersRun(q_first->at_time);
-}
-
 void
 TimerDel(Timer * timer)
 {
diff --git a/src/timers.h b/src/timers.h
index d9117f4b..7ff0ea53 100644
--- a/src/timers.h
+++ b/src/timers.h
@@ -35,7 +35,6 @@ Timer              *TimerAdd(double in_time,
 void                TimerDel(Timer * timer);
 void                TimerSetInterval(Timer * timer, double dt);
 unsigned int        TimersRun(unsigned int t_ms);
-unsigned int        TimersRunExpired(void);
 
 #define TIMER_ADD(timer, in, func, prm) \
    timer = TimerAdd(in, func, prm)