Clean and add timeout into HTTPClient