Simplify http clients by converting them to simple adapters instead
Code cleanup