Clean up the timeout watch code