get rid of connection timeout logic