tidy up

remove http client wrapper
remove redundant commented code