fix timeout and remove unused date