diff --git a/ccm-bundle/bundles/demo/cfg/web-sci.xml b/ccm-bundle/bundles/demo/cfg/web-ccm.xml
similarity index 96%
rename from ccm-bundle/bundles/demo/cfg/web-sci.xml
rename to ccm-bundle/bundles/demo/cfg/web-ccm.xml
index 8601ae4d6..4758a5e00 100644
--- a/ccm-bundle/bundles/demo/cfg/web-sci.xml
+++ b/ccm-bundle/bundles/demo/cfg/web-ccm.xml
@@ -87,30 +87,11 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-<!--
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
--->
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param> 
--->
     <load-on-startup>2</load-on-startup>
   </servlet>
-<!--
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
--->
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -446,12 +427,7 @@
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
   </servlet-mapping>
-<!--
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
--->
+
   <servlet-mapping>
     <servlet-name>cache-manager</servlet-name>
     <url-pattern>/expireCache/*</url-pattern>
diff --git a/ccm-bundle/bundles/devel/cfg/web-sci.xml b/ccm-bundle/bundles/devel/cfg/web-ccm.xml
similarity index 96%
rename from ccm-bundle/bundles/devel/cfg/web-sci.xml
rename to ccm-bundle/bundles/devel/cfg/web-ccm.xml
index d2654ed50..e3887700d 100644
--- a/ccm-bundle/bundles/devel/cfg/web-sci.xml
+++ b/ccm-bundle/bundles/devel/cfg/web-ccm.xml
@@ -87,30 +87,11 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-<!--
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
--->
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param> 
--->
     <load-on-startup>2</load-on-startup>
   </servlet>
-<!--
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
--->
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -446,12 +427,7 @@
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
   </servlet-mapping>
-<!--
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
--->
+
   <servlet-mapping>
     <servlet-name>cache-manager</servlet-name>
     <url-pattern>/expireCache/*</url-pattern>
diff --git a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql
index e835a3791..110ab7814 100644
--- a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql
+++ b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql
@@ -23,3 +23,4 @@ PROMPT Red Hat Enterprise CMS 6.6.6 -> 6.6.7 Upgrade Script (Oracle)
 
 @@ ../default/upgrade/6.6.6-6.6.7/remove_workspace_legacy_entries.sql
 @@ ../default/upgrade/6.6.6-6.6.7/remove_service_legacy_entries.sql
+@@ ../default/upgrade/6.6.6-6.6.7/add_default_workflow.sql
\ No newline at end of file
diff --git a/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql
index 636215533..363786b0b 100644
--- a/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql
+++ b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql
@@ -26,5 +26,6 @@ begin;
 
 \i ../default/upgrade/6.6.6-6.6.7/remove_workspace_legacy_entries.sql
 \i ../default/upgrade/6.6.6-6.6.7/remove_service_legacy_entries.sql
+\i ../default/upgrade/6.6.6-6.6.7/add_default_workflow.sql
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.3-6.6.4.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.3-6.6.4.sql
index 576663441..ae0ccb370 100644
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.3-6.6.4.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.3-6.6.4.sql
@@ -27,11 +27,11 @@ PROMPT Red Hat Enterprise CORE 6.6.3 -> 6.6.4 Upgrade Script (Oracle)
 -- Remove DS entries in apm_package* which are not used anymore.
 @@ default/6.6.3-6.6.4/remove_ds_legacy_entries.sql
 
--- Remove admin entries in apm_package* which are not used anymore.
-@@ default/6.6.3-6.6.4/remove_admin_legacy_entries.sql
-
 -- Remove sitemap entries in apm_package* which are not used anymore.
 @@ default/6.6.3-6.6.4/remove_sitemap_legacy_entries.sql
 
+-- Remove admin entries in apm_package* which are not used anymore.
+@@ default/6.6.3-6.6.4/remove_admin_legacy_entries.sql
+
 -- Remove permissions entries in apm_package* which are not used anymore.
 @@ default/6.6.3-6.6.4/remove_permissions_legacy_entries.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.3-6.6.4.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.3-6.6.4.sql
index 79f88cf27..d04236e76 100644
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.3-6.6.4.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.3-6.6.4.sql
@@ -30,12 +30,12 @@ begin;
 -- Remove ds entries in apm_package* which are not used anymore.
 \i default/6.6.3-6.6.4/remove_ds_legacy_entries.sql
 
--- Remove admin entries in apm_package* which are not used anymore.
-\i default/6.6.3-6.6.4/remove_admin_legacy_entries.sql
-
 -- Remove sitemap entries in apm_package* which are not used anymore.
 \i default/6.6.3-6.6.4/remove_sitemap_legacy_entries.sql
 
+-- Remove admin entries in apm_package* which are not used anymore.
+\i default/6.6.3-6.6.4/remove_admin_legacy_entries.sql
+
 -- Remove permissions entries in apm_package* which are not used anymore.
 \i default/6.6.3-6.6.4/remove_permissions_legacy_entries.sql
 
diff --git a/ccm-core/src/com/arsdigita/templating/SimpleURIResolver.java b/ccm-core/src/com/arsdigita/templating/SimpleURIResolver.java
index f8884be86..482ea49ff 100755
--- a/ccm-core/src/com/arsdigita/templating/SimpleURIResolver.java
+++ b/ccm-core/src/com/arsdigita/templating/SimpleURIResolver.java
@@ -127,7 +127,7 @@ final class SimpleURIResolver implements URIResolver {
             // are relative to 'thisURL'
             return new StreamSource(is, thisURL.toString());
         } catch (IOException ex) {
-            throw new TransformerException("cannot read stream", ex);
+            throw new TransformerException(String.format("cannot read stream for %s", thisURL.toString()), ex);
         }
     }
 }
diff --git a/ccm-core/web/WEB-INF/web.ccm-core.xml b/ccm-core/web/WEB-INF/web.ccm-core.xml
index 3fcf1ea27..2ffb62c22 100644
--- a/ccm-core/web/WEB-INF/web.ccm-core.xml
+++ b/ccm-core/web/WEB-INF/web.ccm-core.xml
@@ -48,30 +48,11 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
 
-<!--
-    <servlet>
-        <servlet-name>legacy-dispatcher</servlet-name>
-        <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-        <load-on-startup>3</load-on-startup>
-    </servlet>
--->
     <servlet>
         <servlet-name>ccm-dispatcher</servlet-name>
         <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-        <init-param>
-            <param-name>fallback-servlet</param-name>
-            <param-value>legacy-dispatcher</param-value>
-        </init-param>
--->
         <load-on-startup>2</load-on-startup>
     </servlet>
-<!--
-    <servlet>
-        <servlet-name>legacy-adapter</servlet-name>
-        <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-    </servlet>
--->
     <servlet>
         <servlet-name>cache-manager</servlet-name>
         <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -164,12 +145,7 @@
         <servlet-name>ccm-dispatcher</servlet-name>
         <url-pattern>/ccm/*</url-pattern>
     </servlet-mapping>
-<!--
-    <servlet-mapping>
-        <servlet-name>legacy-adapter</servlet-name>
-        <url-pattern>/themes/servlet/legacy-adapter/*</url-pattern>
-    </servlet-mapping>
--->
+
     <servlet-mapping>
         <servlet-name>cache-manager</servlet-name>
         <url-pattern>/expireCache/*</url-pattern>
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
index 853089179..e83fcf133 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
@@ -87,30 +87,11 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-<!--
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
--->
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param> 
--->
     <load-on-startup>2</load-on-startup>
   </servlet>
-<!--
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
--->
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -462,12 +443,7 @@
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
   </servlet-mapping>
-<!--
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
--->
+
   <servlet-mapping>
     <servlet-name>cache-manager</servlet-name>
     <url-pattern>/expireCache/*</url-pattern>
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
index 98cb3ad37..80b5967e8 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
@@ -59,30 +59,11 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-<!--
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
--->
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param> 
--->
     <load-on-startup>2</load-on-startup>
   </servlet>
-<!--
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
--->
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -434,12 +415,7 @@
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
   </servlet-mapping>
-<!--
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
--->
+
   <servlet-mapping>
     <servlet-name>cache-manager</servlet-name>
     <url-pattern>/expireCache/*</url-pattern>
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
index 853089179..5aa1686ef 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
@@ -87,30 +87,10 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-<!--
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
--->
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param> 
--->
     <load-on-startup>2</load-on-startup>
   </servlet>
-<!--
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
--->
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -462,12 +442,7 @@
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
   </servlet-mapping>
-<!--
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
--->
+
   <servlet-mapping>
     <servlet-name>cache-manager</servlet-name>
     <url-pattern>/expireCache/*</url-pattern>
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/web.xml b/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
index 853089179..e83fcf133 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
@@ -87,30 +87,11 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-<!--
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
--->
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param> 
--->
     <load-on-startup>2</load-on-startup>
   </servlet>
-<!--
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
--->
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -462,12 +443,7 @@
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
   </servlet-mapping>
-<!--
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
--->
+
   <servlet-mapping>
     <servlet-name>cache-manager</servlet-name>
     <url-pattern>/expireCache/*</url-pattern>
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
index 853089179..e83fcf133 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
@@ -87,30 +87,11 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-<!--
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
--->
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param> 
--->
     <load-on-startup>2</load-on-startup>
   </servlet>
-<!--
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
--->
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -462,12 +443,7 @@
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
   </servlet-mapping>
-<!--
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
--->
+
   <servlet-mapping>
     <servlet-name>cache-manager</servlet-name>
     <url-pattern>/expireCache/*</url-pattern>
diff --git a/ccm-ldn-search/doc/search-standalone/web.xml b/ccm-ldn-search/doc/search-standalone/web.xml
index 0f7647f70..bccb98043 100755
--- a/ccm-ldn-search/doc/search-standalone/web.xml
+++ b/ccm-ldn-search/doc/search-standalone/web.xml
@@ -14,12 +14,6 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-  <servlet>
-    <servlet-name>worker</servlet-name>
-    <servlet-class>com.arsdigita.london.search.SearchWorkerServlet</servlet-class>
-    <load-on-startup>2</load-on-startup>
-  </servlet>
-
   <servlet>
     <servlet-name>files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
diff --git a/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-6.6.0-6.6.1.sql
index 28889e8a9..4751fd439 100644
--- a/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-6.6.0-6.6.1.sql
+++ b/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-6.6.0-6.6.1.sql
@@ -24,6 +24,9 @@ begin;
 -- Under unknown circumstances a constraint may get lost during updating.
 -- Only needed under special conditions or when a missing constraint causes
 -- errors.
+\echo 'This update is only needed if the constraints are missing.'
+\echo 'If the update complains about an existing constraint it is safe '
+\echo 'to ignore this error message.'
 \i ../default/upgrade/6.6.0-6.6.1/upd_constraints.sql
 
 commit;
diff --git a/ccm-sci-bundle/bundles/custom/cfg/web-sci.xml b/ccm-sci-bundle/bundles/custom/cfg/web-sci.xml
index 88529ccfc..ac6019e8f 100644
--- a/ccm-sci-bundle/bundles/custom/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/custom/cfg/web-sci.xml
@@ -87,30 +87,11 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-<!--
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
--->
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param> 
--->
     <load-on-startup>2</load-on-startup>
   </servlet>
-<!--
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
--->
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -446,12 +427,7 @@
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
   </servlet-mapping>
-<!--
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
--->
+
   <servlet-mapping>
     <servlet-name>cache-manager</servlet-name>
     <url-pattern>/expireCache/*</url-pattern>
diff --git a/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml b/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
index 88529ccfc..ac6019e8f 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/demo/cfg/web-sci.xml
@@ -87,30 +87,11 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-<!--
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
--->
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param> 
--->
     <load-on-startup>2</load-on-startup>
   </servlet>
-<!--
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
--->
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -446,12 +427,7 @@
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
   </servlet-mapping>
-<!--
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
--->
+
   <servlet-mapping>
     <servlet-name>cache-manager</servlet-name>
     <url-pattern>/expireCache/*</url-pattern>
diff --git a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
index 88529ccfc..ac6019e8f 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/web-sci.xml
@@ -87,30 +87,11 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-<!--
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
--->
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param> 
--->
     <load-on-startup>2</load-on-startup>
   </servlet>
-<!--
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
--->
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -446,12 +427,7 @@
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
   </servlet-mapping>
-<!--
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
--->
+
   <servlet-mapping>
     <servlet-name>cache-manager</servlet-name>
     <url-pattern>/expireCache/*</url-pattern>
diff --git a/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml b/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml
index e92c3f291..9edb3788b 100644
--- a/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml
+++ b/ccm-sci-bundle/bundles/standard/cfg/web-sci.xml
@@ -87,30 +87,11 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
 
-<!--
-  <servlet>
-    <servlet-name>legacy-dispatcher</servlet-name>
-    <servlet-class>com.arsdigita.sitenode.SiteNodeDispatcher</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
--->
   <servlet>
     <servlet-name>ccm-dispatcher</servlet-name>
     <servlet-class>com.arsdigita.web.DispatcherServlet</servlet-class>
-<!--
-    <init-param>
-      <param-name>fallback-servlet</param-name>
-      <param-value>legacy-dispatcher</param-value>
-    </init-param> 
--->
     <load-on-startup>2</load-on-startup>
   </servlet>
-<!--
-  <servlet>
-    <servlet-name>legacy-adapter</servlet-name>
-    <servlet-class>com.arsdigita.web.LegacyAdapterServlet</servlet-class>
-  </servlet>
--->
   <servlet>
     <servlet-name>cache-manager</servlet-name>
     <servlet-class>com.arsdigita.caching.CacheServlet</servlet-class>
@@ -408,12 +389,7 @@
     <servlet-name>ccm-dispatcher</servlet-name>
     <url-pattern>/ccm/*</url-pattern>
   </servlet-mapping>
-<!--
-  <servlet-mapping>
-    <servlet-name>legacy-adapter</servlet-name>
-    <url-pattern>/templates/servlet/legacy-adapter/*</url-pattern>
-  </servlet-mapping>
--->
+
   <servlet-mapping>
     <servlet-name>cache-manager</servlet-name>
     <url-pattern>/expireCache/*</url-pattern>