Changed to one simple block removing timers.