Getting rid of the old timer thread seems like an enhancement which could follow this patch at a later time.