remove dead code, fix timeout