Cleaned up client_provider