diff --git a/app/models/agent_connect_client.rb b/app/models/agent_connect_client.rb
deleted file mode 100644
index f18eb4a63..000000000
--- a/app/models/agent_connect_client.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class AgentConnectClient < OpenIDConnect::Client
-  def initialize(code = nil)
-    super(AGENT_CONNECT)
-
-    if code.present?
-      self.authorization_code = code
-    end
-  end
-end
diff --git a/app/services/agent_connect_service.rb b/app/services/agent_connect_service.rb
index 4873d8679..1838a72b7 100644
--- a/app/services/agent_connect_service.rb
+++ b/app/services/agent_connect_service.rb
@@ -6,7 +6,7 @@ class AgentConnectService
   end
 
   def self.authorization_uri
-    client = AgentConnectClient.new
+    client = OpenIDConnect::Client.new(AGENT_CONNECT)
 
     state = SecureRandom.hex(16)
     nonce = SecureRandom.hex(16)
@@ -22,7 +22,8 @@ class AgentConnectService
   end
 
   def self.user_info(code, nonce)
-    client = AgentConnectClient.new(code)
+    client = OpenIDConnect::Client.new(AGENT_CONNECT)
+    client.authorization_code = code
 
     access_token = client.access_token!(client_auth_method: :secret)