Remove dependency on Faraday