Cleaned up the API client with cluster addition.