Remove custom client for now (we can revisit the idea in future if needed).