Removed old timer code