get rid of RestClient dependency