diff --git a/examples/demo/src/demo_cms_execution.e b/examples/demo/src/demo_cms_execution.e
index 8ba03e4..efa7875 100644
--- a/examples/demo/src/demo_cms_execution.e
+++ b/examples/demo/src/demo_cms_execution.e
@@ -54,7 +54,7 @@ feature -- CMS modules
 			a_setup.register_module (create {CMS_SESSION_AUTH_MODULE}.make)
 
 				-- Nodes
-			a_setup.register_module (create {CMS_NODE_MODULE}.make (a_setup))
+			a_setup.register_module (create {CMS_NODE_MODULE}.make)
 			a_setup.register_module (create {CMS_PAGE_MODULE}.make)
 			a_setup.register_module (create {CMS_BLOG_MODULE}.make)
 
@@ -72,7 +72,7 @@ feature -- CMS modules
 			a_setup.register_module (create {CMS_TAXONOMY_MODULE}.make)
 
 				-- Wiki
-			a_setup.register_module (create {WIKITEXT_MODULE}.make (a_setup))
+			a_setup.register_module (create {WIKITEXT_MODULE}.make)
 
 				-- Recent changes
 			a_setup.register_module (create {CMS_RECENT_CHANGES_MODULE}.make)
diff --git a/modules/node/cms_node_module.e b/modules/node/cms_node_module.e
index 23022f1..acf2bd4 100644
--- a/modules/node/cms_node_module.e
+++ b/modules/node/cms_node_module.e
@@ -32,21 +32,17 @@ create
 
 feature {NONE} -- Initialization
 
-	make (a_setup: CMS_SETUP)
+	make
 			-- Create Current module, disabled by default.
 		do
 			version := "1.0"
 			description := "Service to manage content based on 'node'"
 			package := "core"
-			config := a_setup
 				-- Optional dependencies, mainly for information.
 			put_dependency ({CMS_RECENT_CHANGES_MODULE}, False)
 			put_dependency ({CMS_TAXONOMY_MODULE}, False)
 		end
 
-	config: CMS_SETUP
-			-- Node configuration.
-
 feature -- Access
 
 	name: STRING = "node"
diff --git a/modules/wikitext/wikitext_module.e b/modules/wikitext/wikitext_module.e
index 0b721c4..92c5e9a 100644
--- a/modules/wikitext/wikitext_module.e
+++ b/modules/wikitext/wikitext_module.e
@@ -23,18 +23,14 @@ create
 
 feature {NONE} -- Initialization
 
-	make (a_setup: CMS_SETUP)
+	make
 			-- Create Current module, disabled by default.
 		do
 			version := "1.0"
 			description := "Wikitext module"
 			package := "filter"
-			config := a_setup
 		end
 
-	config: CMS_SETUP
-			-- Node configuration.
-
 feature -- Access
 
 	name: STRING = "wikitext"