am 3466f510: RIP: Removal of more dead timer code

* commit '3466f510fc41f71021ac46dbbd9734d828942332':
  RIP: Removal of more dead timer code