Get rid of RESTClient, UploadingClient