diff --git a/library/server/wsf/router/support/uri/helpers/wsf_uri_agent_handler.e b/library/server/wsf/router/support/uri/helpers/wsf_uri_agent_handler.e
index b2a5089c..03a28fdd 100644
--- a/library/server/wsf/router/support/uri/helpers/wsf_uri_agent_handler.e
+++ b/library/server/wsf/router/support/uri/helpers/wsf_uri_agent_handler.e
@@ -10,14 +10,27 @@ class
 inherit
 	WSF_URI_HANDLER
 
-	WSF_AGENT_HANDLER
-		rename
-			set_action as make
-		end
-
 create
 	make
 
+feature {NONE} -- Initialization
+
+	make (a_action: like action)
+		do
+			action := a_action
+		end
+
+feature -- Access	
+
+	action: PROCEDURE [ANY, TUPLE [request: WSF_REQUEST; response: WSF_RESPONSE]]
+
+feature -- Execution
+
+	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+		do
+			action.call ([req, res])
+		end
+
 note
 	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_agent_handler.e b/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_agent_handler.e
index c8e83fc0..cfe05c53 100644
--- a/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_agent_handler.e
+++ b/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_agent_handler.e
@@ -10,14 +10,27 @@ class
 inherit
 	WSF_URI_TEMPLATE_HANDLER
 
-	WSF_AGENT_HANDLER
-		rename
-			set_action as make
-		end
-
 create
 	make
 
+feature {NONE} -- Initialization
+
+	make (a_action: like action)
+		do
+			action := a_action
+		end
+
+feature -- Access	
+
+	action: PROCEDURE [ANY, TUPLE [request: WSF_REQUEST; response: WSF_RESPONSE]]
+
+feature -- Execution
+
+	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+		do
+			action.call ([req, res])
+		end
+
 note
 	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
diff --git a/library/server/wsf/router/wsf_agent_handler.e b/library/server/wsf/router/wsf_agent_handler.e
deleted file mode 100644
index 3a25afef..00000000
--- a/library/server/wsf/router/wsf_agent_handler.e
+++ /dev/null
@@ -1,41 +0,0 @@
-note
-	description: "Summary description for {WSF_AGENT_HANDLER}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-deferred class
-	WSF_AGENT_HANDLER 
-
-inherit
-	WSF_HANDLER
-
-feature -- Change
-
-	set_action (a_action: like action)
-		do
-			action := a_action
-		end
-
-feature -- Access	
-
-	action: PROCEDURE [ANY, TUPLE [request: WSF_REQUEST; response: WSF_RESPONSE]]
-
-feature -- Execution
-
-	execute (req: WSF_REQUEST; res: WSF_RESPONSE)
-		do
-			action.call ([req, res])
-		end
-
-note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			5949 Hollister Ave., Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-end