Removed dependance on basic-http client