And remove more timers code...