[Reviewer: Andy] Make timers redundant

Agreed not to as I don't have time to test it.