Added removal of timers