more timer cleanups