Remove some fields from ProviderClient.
Trim unused fields out of (Provider|Service)Client.
Use general (Provider|Service)Client structs.
Update acceptance tests to match.