diff --git a/lib/lsp-devtools/lsp_devtools/agent/client.py b/lib/lsp-devtools/lsp_devtools/agent/client.py
index e91d916..f36c8f9 100644
--- a/lib/lsp-devtools/lsp_devtools/agent/client.py
+++ b/lib/lsp-devtools/lsp_devtools/agent/client.py
@@ -3,7 +3,7 @@
 from typing import Optional
 
 import stamina
-from pygls.client import Client
+from pygls.client import JsonRPCClient
 from pygls.client import aio_readline
 from pygls.protocol import default_converter
 
@@ -29,7 +29,7 @@
 #         asyncio.ensure_future(self._ws.send(data))
 
 
-class AgentClient(Client):
+class AgentClient(JsonRPCClient):
     """Client for connecting to an AgentServer instance."""
 
     protocol: AgentProtocol
diff --git a/lib/lsp-devtools/lsp_devtools/agent/server.py b/lib/lsp-devtools/lsp_devtools/agent/server.py
index 3b9bd9f..41f20f8 100644
--- a/lib/lsp-devtools/lsp_devtools/agent/server.py
+++ b/lib/lsp-devtools/lsp_devtools/agent/server.py
@@ -3,7 +3,6 @@
 import re
 import threading
 from typing import Any
-from typing import Callable
 from typing import Optional
 
 from pygls.client import aio_readline