Neaten, remove some timers