Minor changes to reduce code base and remove some timer threads.