Remove need for api_client
Do not setup api_client.
Remove api_client from client creation.