Cleanup to the requester connection setup.
adding hard timeout back in