D: remove unused function
U: handle timeout at server side. see #99