Clean up client timeout definitions [rev. 2]