removed some old timer code