More cleanup work of the timer API