[Reviewer: Andy] Make timers redundant