diff --git a/cms.ecf b/cms.ecf
index 90f8a65..64106ec 100644
--- a/cms.ecf
+++ b/cms.ecf
@@ -3,16 +3,10 @@
 	<target name="cms">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<mapping old_name="CMS_LAYOUT" new_name="CMS_ENVIRONMENT"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
diff --git a/dev_modules/masquerade_auth/masquerade_auth.ecf b/dev_modules/masquerade_auth/masquerade_auth.ecf
index f2f8bc9..43ec063 100644
--- a/dev_modules/masquerade_auth/masquerade_auth.ecf
+++ b/dev_modules/masquerade_auth/masquerade_auth.ecf
@@ -3,15 +3,10 @@
 	<target name="masquerade_auth">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
 		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/examples/demo/demo.ecf b/examples/demo/demo.ecf
index c5953dd..95b09cb 100644
--- a/examples/demo/demo.ecf
+++ b/examples/demo/demo.ecf
@@ -4,7 +4,7 @@
 	<target name="common" abstract="true">
 		<root class="DEMO_CMS_SERVER" feature="make_and_launch"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
@@ -12,10 +12,6 @@
 			<debug name="dbglog" enabled="true"/>
 		</option>
 		<setting name="executable_name" value="demo"/>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false">
 			<option>
diff --git a/examples/demo/modules/demo/cms_demo_module.ecf b/examples/demo/modules/demo/cms_demo_module.ecf
index c47d577..2e9c18c 100644
--- a/examples/demo/modules/demo/cms_demo_module.ecf
+++ b/examples/demo/modules/demo/cms_demo_module.ecf
@@ -3,15 +3,10 @@
 	<target name="cms_demo_module">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="cms" location="..\..\..\..\cms.ecf" readonly="false"/>
diff --git a/launcher/any.ecf b/launcher/any.ecf
index 9440bc5..05c261e 100644
--- a/launcher/any.ecf
+++ b/launcher/any.ecf
@@ -2,9 +2,6 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="launcher" uuid="6FDCA393-AFC3-436B-A58A-870923967C86" library_target="launcher">
 	<target name="common" abstract="true">
 		<root all_classes="true"/>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\cms.ecf"/>
 		<library name="cms_app_env" location="..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/launcher/cgi.ecf b/launcher/cgi.ecf
index dc3bffe..72a70f8 100644
--- a/launcher/cgi.ecf
+++ b/launcher/cgi.ecf
@@ -2,9 +2,6 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="cgi_launcher" uuid="0FE4F1D0-BB70-4C7F-A66E-B27F1D718109" library_target="cgi_launcher">
 	<target name="common" abstract="true">
 		<root all_classes="true"/>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\cms.ecf"/>
 		<library name="cms_app_env" location="..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/launcher/libfcgi.ecf b/launcher/libfcgi.ecf
index 802f917..d6c510c 100644
--- a/launcher/libfcgi.ecf
+++ b/launcher/libfcgi.ecf
@@ -2,9 +2,6 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="libfcgi_launcher" uuid="04D7D1EA-059B-4024-B0DE-BBB57AB2D00C" library_target="libfcgi_launcher">
 	<target name="common" abstract="true">
 		<root all_classes="true"/>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\cms.ecf"/>
 		<library name="cms_app_env" location="..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/launcher/standalone.ecf b/launcher/standalone.ecf
index 2590032..7cd2d08 100644
--- a/launcher/standalone.ecf
+++ b/launcher/standalone.ecf
@@ -2,9 +2,6 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="standalone_launcher" uuid="F42660A9-26C2-466B-A63C-C7823C808BE7" library_target="standalone_launcher">
 	<target name="common" abstract="true">
 		<root all_classes="true"/>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\cms.ecf"/>
 		<library name="cms_app_env" location="..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/library/app_env/app_env.ecf b/library/app_env/app_env.ecf
index 8833c6d..29d7fa6 100644
--- a/library/app_env/app_env.ecf
+++ b/library/app_env/app_env.ecf
@@ -3,18 +3,12 @@
 	<description>Application Environment (layout, configuration, logger, database, ...)</description>
 	<target name="app_env">
 		<root all_classes="true"/>
-		<option warning="true" is_obsolete_routine_type="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
 		<library name="logging" location="$ISE_LIBRARY\library\runtime\logging\logging.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true">
 			<file_rule>
-				<exclude>/.svn$</exclude>
+				<exclude>/\.svn$</exclude>
 				<exclude>/CVS$</exclude>
 				<exclude>/EIFGENs$</exclude>
 			</file_rule>
diff --git a/library/configuration/config.ecf b/library/configuration/config.ecf
index 72e8bcb..dec3db6 100644
--- a/library/configuration/config.ecf
+++ b/library/configuration/config.ecf
@@ -3,15 +3,10 @@
 	<target name="config">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
diff --git a/library/configuration/tests/config_tests.ecf b/library/configuration/tests/config_tests.ecf
index 2bb6bf3..7ff165b 100644
--- a/library/configuration/tests/config_tests.ecf
+++ b/library/configuration/tests/config_tests.ecf
@@ -3,12 +3,10 @@
 	<target name="config_tests">
 		<root class="TEST_CONFIG_READER_SET" feature="default_create"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" syntax="standard">
-		</option>
 		<capability>
 			<concurrency support="none" use="none"/>
 			<void_safety support="transitional" use="transitional"/>
diff --git a/library/email/email.ecf b/library/email/email.ecf
index 7317a73..3e39a62 100644
--- a/library/email/email.ecf
+++ b/library/email/email.ecf
@@ -3,15 +3,10 @@
 	<target name="email_service">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms_app_env" location="..\app_env\app_env.ecf"/>
 		<library name="notification_mailer" location="$ISE_LIBRARY\contrib\library\runtime\process\notification_email\notification_email.ecf"/>
diff --git a/library/gcse/gcse.ecf b/library/gcse/gcse.ecf
index 9fb986b..7cd7e14 100644
--- a/library/gcse/gcse.ecf
+++ b/library/gcse/gcse.ecf
@@ -3,16 +3,11 @@
 	<target name="gcse">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="http_client_extension" location="..\http_client_extension\http_client_extension.ecf" readonly="false"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
diff --git a/library/gcse/test/test.ecf b/library/gcse/test/test.ecf
index 8c93682..b84719d 100644
--- a/library/gcse/test/test.ecf
+++ b/library/gcse/test/test.ecf
@@ -2,7 +2,7 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="test" uuid="8E9CF931-93CE-4C5A-BF1A-6FD7D850C5FB">
 	<target name="test">
 		<root class="APPLICATION" feature="make"/>
-		<option warning="true" is_obsolete_routine_type="true">
+		<option warning="true">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
@@ -15,7 +15,7 @@
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing.ecf"/>
 		<cluster name="test" location=".\" recursive="true">
 			<file_rule>
-				<exclude>/.svn$</exclude>
+				<exclude>/\.svn$</exclude>
 				<exclude>/CVS$</exclude>
 				<exclude>/EIFGENs$</exclude>
 			</file_rule>
diff --git a/library/http_client_extension/http_client_extension.ecf b/library/http_client_extension/http_client_extension.ecf
index ba5681b..5671fff 100644
--- a/library/http_client_extension/http_client_extension.ecf
+++ b/library/http_client_extension/http_client_extension.ecf
@@ -2,12 +2,12 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="http_client_extension" uuid="EA6A381D-2E78-448C-8A6D-B71759F1082E" library_target="http_client_extension">
 	<target name="http_client_extension">
 		<root all_classes="true"/>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
+		<file_rule>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
+		</file_rule>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL.ecf"/>
@@ -16,13 +16,6 @@
 		<library name="http_client" location="$ISE_LIBRARY\contrib\library\network\http_client\http_client.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
 		<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/>
-		<cluster name="http_client_extension" location=".\src\" recursive="true">
-			<file_rule>
-				<exclude>/.git$</exclude>
-				<exclude>/.svn$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/EIFGENs$</exclude>
-			</file_rule>
-		</cluster>
+		<cluster name="http_client_extension" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/model/cms_model.ecf b/library/model/cms_model.ecf
index 1388b65..429729c 100644
--- a/library/model/cms_model.ecf
+++ b/library/model/cms_model.ecf
@@ -2,21 +2,15 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="cms_model" uuid="57C6F407-E894-4554-8A59-C8D1F3BBC5D7" library_target="cms_model">
 	<target name="cms_model">
 		<root all_classes="true"/>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
+		<file_rule>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
+		</file_rule>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<cluster name="cms_model" location=".\src\" recursive="true">
-			<file_rule>
-				<exclude>/.svn$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/EIFGENs$</exclude>
-			</file_rule>
-		</cluster>
+		<cluster name="cms_model" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/persistence/sqlite3/sqlite3.ecf b/library/persistence/sqlite3/sqlite3.ecf
index a52f4ad..7e6460f 100644
--- a/library/persistence/sqlite3/sqlite3.ecf
+++ b/library/persistence/sqlite3/sqlite3.ecf
@@ -2,11 +2,12 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="persistence_sqlite3" uuid="4E536C92-A09F-4305-8230-2EC5ABC51416" library_target="persistence_sqlite3">
 	<target name="persistence_sqlite3">
 		<root all_classes="true"/>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
+		<file_rule>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/EIFGENs$</exclude>
+		</file_rule>
 		<library name="app_env" location="..\..\app_env\app_env.ecf"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\..\cms.ecf"/>
@@ -18,13 +19,6 @@
 		<library name="model" location="..\..\model\cms_model.ecf"/>
 		<library name="sqlite3" location="$ISE_LIBRARY\unstable\library\persistency\database\sqlite3\sqlite.ecf" readonly="false"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<cluster name="persistence_sqlite" location=".\src\" recursive="true">
-			<file_rule>
-				<exclude>/.svn$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/old$</exclude>
-			</file_rule>
-		</cluster>
+		<cluster name="persistence_sqlite" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/persistence/store_mysql/store_mysql.ecf b/library/persistence/store_mysql/store_mysql.ecf
index bf33e05..2d8e3b7 100644
--- a/library/persistence/store_mysql/store_mysql.ecf
+++ b/library/persistence/store_mysql/store_mysql.ecf
@@ -3,11 +3,6 @@
 	<description>CMS Eiffel Store MySQL persistence solution</description>
 	<target name="store_mysql">
 		<root all_classes="true"/>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\..\cms.ecf" readonly="false"/>
 		<library name="cms_app_env" location="..\..\app_env\app_env.ecf"/>
@@ -27,7 +22,8 @@
 		</cluster>
 		<cluster name="persistence_store_mysql" location=".\src\" recursive="true">
 			<file_rule>
-				<exclude>/.svn$</exclude>
+				<exclude>/\.git$</exclude>
+				<exclude>/\.svn$</exclude>
 				<exclude>/CVS$</exclude>
 				<exclude>/EIFGENs$</exclude>
 			</file_rule>
diff --git a/library/persistence/store_mysql/tests/tests.ecf b/library/persistence/store_mysql/tests/tests.ecf
index 5b4dc79..5dee278 100644
--- a/library/persistence/store_mysql/tests/tests.ecf
+++ b/library/persistence/store_mysql/tests/tests.ecf
@@ -2,7 +2,7 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="tests" uuid="FCC2264E-784F-4ACF-9262-E348904FDBA5">
 	<target name="tests">
 		<root class="APPLICATION" feature="make"/>
-		<option warning="true" is_obsolete_routine_type="true">
+		<option warning="true" >
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<capability>
@@ -19,7 +19,7 @@
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing.ecf"/>
 		<cluster name="tests" location=".\" recursive="true">
 			<file_rule>
-				<exclude>/.svn$</exclude>
+				<exclude>/\.svn$</exclude>
 				<exclude>/CVS$</exclude>
 				<exclude>/EIFGENs$</exclude>
 				<exclude>/nodes$</exclude>
diff --git a/library/persistence/store_mysql_fake/store_mysql.ecf b/library/persistence/store_mysql_fake/store_mysql.ecf
index 8f66b24..53c4c71 100644
--- a/library/persistence/store_mysql_fake/store_mysql.ecf
+++ b/library/persistence/store_mysql_fake/store_mysql.ecf
@@ -3,8 +3,6 @@
 	<description>CMS Eiffel Store MySQL persistence solution FAKE!!!</description>
 	<target name="store_mysql_fake">
 		<root all_classes="true"/>
-		<option warning="true">
-		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\..\cms.ecf" readonly="false"/>
 		<library name="cms_app_env" location="..\..\app_env\app_env.ecf"/>
@@ -17,7 +15,7 @@
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<cluster name="persistence_store_mysql_fake" location=".\src\" recursive="true">
 			<file_rule>
-				<exclude>/.svn$</exclude>
+				<exclude>/\.svn$</exclude>
 				<exclude>/CVS$</exclude>
 				<exclude>/EIFGENs$</exclude>
 			</file_rule>
diff --git a/library/persistence/store_odbc/store_odbc.ecf b/library/persistence/store_odbc/store_odbc.ecf
index e92a455..d7386d7 100644
--- a/library/persistence/store_odbc/store_odbc.ecf
+++ b/library/persistence/store_odbc/store_odbc.ecf
@@ -3,11 +3,6 @@
 	<target name="persistence_store_odbc">
 		<description>CMS Eiffel Store ODBC persistence solution</description>
 		<root all_classes="true"/>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\..\cms.ecf"/>
 		<library name="cms_app_env" location="..\..\app_env\app_env.ecf"/>
@@ -23,7 +18,7 @@
 		<cluster name="common" location="..\implementation\store\" recursive="true"/>
 		<cluster name="persistence_store_odbc" location=".\src\" recursive="true">
 			<file_rule>
-				<exclude>/.svn$</exclude>
+				<exclude>/\.svn$</exclude>
 				<exclude>/CVS$</exclude>
 				<exclude>/EIFGENs$</exclude>
 			</file_rule>
diff --git a/library/persistence/store_odbc/tests/tests.ecf b/library/persistence/store_odbc/tests/tests.ecf
index 4954658..9ad3d5b 100644
--- a/library/persistence/store_odbc/tests/tests.ecf
+++ b/library/persistence/store_odbc/tests/tests.ecf
@@ -2,7 +2,7 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="tests_store_odbc" uuid="FE27C81D-3F7D-4E46-992B-55F4BBDA4F8B" library_target="tests_store_odbc">
 	<target name="tests_store_odbc">
 		<root class="APPLICATION" feature="make"/>
-		<option warning="true" is_obsolete_routine_type="true">
+		<option warning="true">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<capability>
@@ -19,7 +19,7 @@
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing.ecf"/>
 		<cluster name="tests" location=".\" recursive="true">
 			<file_rule>
-				<exclude>/.svn$</exclude>
+				<exclude>/\.svn$</exclude>
 				<exclude>/CVS$</exclude>
 				<exclude>/EIFGENs$</exclude>
 				<exclude>/nodes$</exclude>
diff --git a/library/recaptcha/recaptcha.ecf b/library/recaptcha/recaptcha.ecf
index ddf70a5..2d7d963 100644
--- a/library/recaptcha/recaptcha.ecf
+++ b/library/recaptcha/recaptcha.ecf
@@ -8,12 +8,6 @@
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="http_client_extension" location="..\http_client_extension\http_client_extension.ecf"/>
 		<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf"/>
diff --git a/library/recaptcha/test/test.ecf b/library/recaptcha/test/test.ecf
index e2fe1b9..15f4b4d 100644
--- a/library/recaptcha/test/test.ecf
+++ b/library/recaptcha/test/test.ecf
@@ -2,7 +2,7 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="test" uuid="CE9FCE69-EE0A-4028-AA02-BD9F8ABA7586">
 	<target name="test">
 		<root class="APPLICATION" feature="make"/>
-		<option warning="true" is_obsolete_routine_type="true">
+		<option warning="true">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="console_application" value="true"/>
@@ -16,7 +16,7 @@
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing.ecf"/>
 		<cluster name="test" location=".\" recursive="true">
 			<file_rule>
-				<exclude>/.svn$</exclude>
+				<exclude>/\.svn$</exclude>
 				<exclude>/CVS$</exclude>
 				<exclude>/EIFGENs$</exclude>
 			</file_rule>
diff --git a/modules/admin/admin.ecf b/modules/admin/admin.ecf
index bdc4cb8..d2962d4 100644
--- a/modules/admin/admin.ecf
+++ b/modules/admin/admin.ecf
@@ -3,17 +3,10 @@
 	<target name="admin">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" is_obsolete_routine_type="true">
-			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
 		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/modules/auth/auth.ecf b/modules/auth/auth.ecf
index 893fab9..f50e40b 100644
--- a/modules/auth/auth.ecf
+++ b/modules/auth/auth.ecf
@@ -3,16 +3,10 @@
 	<target name="auth_module">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<library name="apis" location="$ISE_LIBRARY\contrib\library\web\authentication\oauth\cypress\consumer\apis\apis.ecf" readonly="false"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
diff --git a/modules/basic_auth/basic_auth.ecf b/modules/basic_auth/basic_auth.ecf
index 33d497c..f4d6f4c 100644
--- a/modules/basic_auth/basic_auth.ecf
+++ b/modules/basic_auth/basic_auth.ecf
@@ -3,16 +3,10 @@
 	<target name="basic_auth">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
 		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/modules/blog/cms_blog_module.ecf b/modules/blog/cms_blog_module.ecf
index 96e9d1b..8e1f871 100644
--- a/modules/blog/cms_blog_module.ecf
+++ b/modules/blog/cms_blog_module.ecf
@@ -3,16 +3,10 @@
 	<target name="cms_blog_module">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
diff --git a/modules/comments/comments.ecf b/modules/comments/comments.ecf
index 60d5d97..2e466f9 100644
--- a/modules/comments/comments.ecf
+++ b/modules/comments/comments.ecf
@@ -3,15 +3,10 @@
 	<target name="comments_module">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
diff --git a/modules/contact/contact.ecf b/modules/contact/contact.ecf
index ec2ebf4..9d03e45 100644
--- a/modules/contact/contact.ecf
+++ b/modules/contact/contact.ecf
@@ -2,9 +2,6 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="contact" uuid="5F9BB4AA-FB62-4550-B314-DED374843DC0" library_target="contact">
 	<target name="contact">
 		<root all_classes="true"/>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
 		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/modules/custom_block/custom_block.ecf b/modules/custom_block/custom_block.ecf
index a33a407..6fa0161 100644
--- a/modules/custom_block/custom_block.ecf
+++ b/modules/custom_block/custom_block.ecf
@@ -3,15 +3,10 @@
 	<target name="custom_block_module">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
 		<library name="cms_model" location="..\..\library\model\cms_model.ecf"/>
diff --git a/modules/embedded_video/embedded_video.ecf b/modules/embedded_video/embedded_video.ecf
index b3b3060..afa6c87 100644
--- a/modules/embedded_video/embedded_video.ecf
+++ b/modules/embedded_video/embedded_video.ecf
@@ -2,12 +2,6 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="embedded_video" uuid="1469E34C-98EE-4E39-BC13-24A0D93A7EC0" library_target="embedded_video">
 	<target name="embedded_video">
 		<root all_classes="true"/>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
 		<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
diff --git a/modules/embedded_video/test/testing.ecf b/modules/embedded_video/test/testing.ecf
index 19c81b7..5fd3a1e 100644
--- a/modules/embedded_video/test/testing.ecf
+++ b/modules/embedded_video/test/testing.ecf
@@ -3,12 +3,10 @@
 	<target name="embedded_video_testing">
 		<root class="ANY" feature="default_create"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
 		<capability>
 			<concurrency support="none"/>
 		</capability>
diff --git a/modules/feed_aggregator/feed_aggregator.ecf b/modules/feed_aggregator/feed_aggregator.ecf
index 93c749c..0aa056f 100644
--- a/modules/feed_aggregator/feed_aggregator.ecf
+++ b/modules/feed_aggregator/feed_aggregator.ecf
@@ -2,9 +2,6 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="feed_aggregator" uuid="6A78AB37-9B07-4C42-9E24-0CA7D3C61E12" library_target="feed_aggregator">
 	<target name="feed_aggregator">
 		<root all_classes="true"/>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
diff --git a/modules/files/files.ecf b/modules/files/files.ecf
index 7a53bc9..cda245b 100644
--- a/modules/files/files.ecf
+++ b/modules/files/files.ecf
@@ -3,15 +3,10 @@
 	<target name="files_module">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
 		<library name="cms_model" location="..\..\library\model\cms_model.ecf"/>
diff --git a/modules/google_search/google_search.ecf b/modules/google_search/google_search.ecf
index 3ee3e26..7fbc252 100644
--- a/modules/google_search/google_search.ecf
+++ b/modules/google_search/google_search.ecf
@@ -2,9 +2,6 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="google_search" uuid="054E9C5C-ACCB-4A4D-B825-6C574AEC30A9" library_target="google_search">
 	<target name="google_search">
 		<root all_classes="true"/>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
 		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/modules/google_search_20/google_search_20.ecf b/modules/google_search_20/google_search_20.ecf
index 86b55a8..b8820cd 100644
--- a/modules/google_search_20/google_search_20.ecf
+++ b/modules/google_search_20/google_search_20.ecf
@@ -2,9 +2,6 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="google_search_20" uuid="3FAAD593-3428-43B9-8CE1-BC6E5FE81F19" library_target="google_search_20">
 	<target name="google_search_20">
 		<root all_classes="true"/>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
 		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/modules/messaging/messaging.ecf b/modules/messaging/messaging.ecf
index 4898cb4..98f393c 100644
--- a/modules/messaging/messaging.ecf
+++ b/modules/messaging/messaging.ecf
@@ -2,10 +2,6 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="messaging" uuid="939C9362-FD46-4B4F-BB36-A593089430AB" library_target="messaging">
 	<target name="messaging">
 		<root all_classes="true"/>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
 		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/modules/node/node.ecf b/modules/node/node.ecf
index bc9e87b..8cdd22d 100644
--- a/modules/node/node.ecf
+++ b/modules/node/node.ecf
@@ -3,15 +3,10 @@
 	<target name="node">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
 		<library name="cms_comments_module" location="..\..\modules\comments\comments.ecf" readonly="false"/>
diff --git a/modules/oauth20/oauth20.ecf b/modules/oauth20/oauth20.ecf
index ec85d7c..a13a01b 100644
--- a/modules/oauth20/oauth20.ecf
+++ b/modules/oauth20/oauth20.ecf
@@ -3,15 +3,10 @@
 	<target name="oauth_module">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="apis" location="$ISE_LIBRARY\contrib\library\web\authentication\oauth\cypress\consumer\apis\apis.ecf" readonly="false"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
diff --git a/modules/openid/openid.ecf b/modules/openid/openid.ecf
index 38cb841..87c32fb 100644
--- a/modules/openid/openid.ecf
+++ b/modules/openid/openid.ecf
@@ -3,15 +3,10 @@
 	<target name="openid_module">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
 		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/modules/recent_changes/recent_changes.ecf b/modules/recent_changes/recent_changes.ecf
index 6db3441..8970e46 100644
--- a/modules/recent_changes/recent_changes.ecf
+++ b/modules/recent_changes/recent_changes.ecf
@@ -3,15 +3,10 @@
 	<target name="recent_changes">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
diff --git a/modules/seo/seo.ecf b/modules/seo/seo.ecf
index bd66e7f..9f68f8d 100644
--- a/modules/seo/seo.ecf
+++ b/modules/seo/seo.ecf
@@ -2,9 +2,6 @@
 <system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="seo" uuid="D53D622D-1F5A-4079-82B9-3E9A1605832B" library_target="seo">
 	<target name="seo">
 		<root all_classes="true"/>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
 		<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
diff --git a/modules/session_auth/cms_session_auth.ecf b/modules/session_auth/cms_session_auth.ecf
index 1298aa9..a02c652 100644
--- a/modules/session_auth/cms_session_auth.ecf
+++ b/modules/session_auth/cms_session_auth.ecf
@@ -3,15 +3,10 @@
 	<target name="session_auth">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
 		<library name="cms_app_env" location="..\..\library\app_env\app_env.ecf" readonly="false"/>
diff --git a/modules/sitemap/sitemap.ecf b/modules/sitemap/sitemap.ecf
index e4dd05d..6251801 100644
--- a/modules/sitemap/sitemap.ecf
+++ b/modules/sitemap/sitemap.ecf
@@ -3,16 +3,10 @@
 	<target name="sitemap">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
diff --git a/modules/taxonomy/taxonomy.ecf b/modules/taxonomy/taxonomy.ecf
index 1d6dd1b..dfe00d1 100644
--- a/modules/taxonomy/taxonomy.ecf
+++ b/modules/taxonomy/taxonomy.ecf
@@ -3,15 +3,10 @@
 	<target name="cms_taxonomy_module">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="cms" location="..\..\cms.ecf" readonly="false"/>
diff --git a/modules/wikitext/wikitext.ecf b/modules/wikitext/wikitext.ecf
index feadf9e..d3cffe8 100644
--- a/modules/wikitext/wikitext.ecf
+++ b/modules/wikitext/wikitext.ecf
@@ -3,16 +3,10 @@
 	<target name="wikitext">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/CVS$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true">
-		</option>
-		<capability>
-			<concurrency support="scoop" use="scoop"/>
-			<void_safety support="all" use="all"/>
-		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="cms" location="..\..\cms.ecf"/>
 		<library name="cms_model" location="..\..\library\model\cms_model.ecf" readonly="false"/>
diff --git a/tests/all.ecf b/tests/all.ecf
index 4675895..15a66dd 100644
--- a/tests/all.ecf
+++ b/tests/all.ecf
@@ -4,11 +4,11 @@
 	<target name="all">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" syntax="standard">
+		<option warning="true" full_class_checking="true">
 		</option>
 		<capability>
 			<concurrency support="none"/>
diff --git a/tools/roc/roc.ecf b/tools/roc/roc.ecf
index 4b05b2b..6e039f0 100644
--- a/tools/roc/roc.ecf
+++ b/tools/roc/roc.ecf
@@ -8,14 +8,13 @@
 		<setting name="console_application" value="true"/>
 		<capability>
 			<concurrency support="none"/>
-			<void_safety support="all" use="all"/>
 		</capability>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="config" location="..\..\library\configuration\config.ecf"/>
 		<library name="encoding" location="$ISE_LIBRARY\library\encoding\encoding.ecf"/>
 		<cluster name="roc" location=".\" recursive="true">
 			<file_rule>
-				<exclude>/.svn$</exclude>
+				<exclude>/\.svn$</exclude>
 				<exclude>/CVS$</exclude>
 				<exclude>/EIFGENs$</exclude>
 			</file_rule>