removed incomplete timout stuff from client