D: simplify client timeout