More timer cleanup.