diff --git a/ccm-zes-aplaws/bundles/devel/bundle.in b/ccm-zes-aplaws/bundles/devel/bundle.in
index ad1200c37..5e469a349 100644
--- a/ccm-zes-aplaws/bundles/devel/bundle.in
+++ b/ccm-zes-aplaws/bundles/devel/bundle.in
@@ -1,4 +1,4 @@
-BUNDLE_NAME=aplaws-plus-devel
-BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle"
+BUNDLE_NAME=aplaws-plus-zes-devel
+BUNDLE_PRETTY_NAME="APLAWS+ ZeS Devel Bundle"
 VERSION=1.0.5devel
 RELEASE=1
diff --git a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
index a80059125..975ace0c0 100644
--- a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
+++ b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
@@ -3,35 +3,76 @@ ccm-core
 ccm-cms
 
 # Content assets
+ccm-cms-assets-fileattachment
+ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
-ccm-ldn-dublin
 
 # Content types
-ccm-cms-types-contact
-ccm-cms-types-esdservice
+ccm-cms-types-address
+# -- ccm-cms-types-agenda
 ccm-cms-types-article
+ccm-cms-types-bookmark
+ccm-cms-types-contact
+# -- ccm-cms-types-esdservice
+ccm-cms-types-event
+#  --  faqitem koennte bei zes auch entfallen
+#      2008-06-07 auskommentiert, ist in Produktionssystem
+#      nicht enthalten und nicht anwählbar.
+# -- ccm-cms-types-faqitem
 ccm-cms-types-filestorageitem
-ccm-cms-types-mparticle
-ccm-cms-types-newsitem
-ccm-cms-types-pressrelease
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
-ccm-cms-types-inlinesite
-ccm-ldn-xmlfeed
+#  --  glossaryitem koennte bei zes auch entfallen
+#      2008-06-07 auskommentiert, ist in Produktionssystem
+#      nicht enthalten und nicht anwählbar.
+# -- ccm-cms-types-glossaryitem
+# -- ccm-cms-types-htmlform
+# -- ccm-cms-types-inlinesite
+# -- ccm-cms-types-job
+# -- ccm-cms-types-legalnotice
+# -- ccm-cms-types-minutes
+# -- ccm-cms-types-motditem
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+# -- ccm-cms-types-organization
+# -- ccm-cms-types-pressrelease
+# -- ccm-cms-types-service
+ccm-cms-types-siteproxy
+
 
 # Applications
-ccm-ldn-util
-ccm-ldn-atoz
-ccm-ldn-rss
-ccm-ldn-portal
+# ------------
+# -- ccm-auth-http
+# -- ccm-bookmarks
+# -- ccm-docmngr    ## temp., produces errors in build
+# -- ccm-formbuilder-pdf
+ccm-forum
+ccm-simplesurvey
+ccm-user-preferences
+# -- ccm-weblog
+# -- ccm-webpage
+
+# ldn extensions
+# --------------
+# -- ccm-ldn-aplaws
+# -- ccm-ldn-atoz
+# -- ccm-ldn-dublin
+# -- ccm-ldn-exporter
+# -- ccm-ldn-freeform
+ccm-ldn-image-step
+# -- ccm-ldn-importer
 ccm-ldn-navigation
+ccm-ldn-portal
+ccm-ldn-rss
 ccm-ldn-search
 ccm-ldn-shortcuts
 ccm-ldn-subsite
 ccm-ldn-terms
-ccm-ldn-aplaws
-
-# Extra apps
-ccm-forum
-ccm-ldn-importer
 ccm-ldn-theme
+ccm-ldn-util
+#  --  xmlfeed wird moeglicherweise ebenfalls nicht gebraucht
+ccm-ldn-xmlfeed
+
+# zes extensions
+ccm-zes-aplaws
+
diff --git a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties
index a0ec0b0ca..fecf76d0a 100644
--- a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties
@@ -1,15 +1,20 @@
+; in core: Sucht PatternStyleSheet, u.a. um passende localization zu finden
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
 waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
+;
 waf.kernel.data_permission_check_enabled=false
+waf.kernel.primary_user_identifier=email
 waf.dispatcher.default_expiry=3600
+
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-waf.pagemap.root=portal/
-waf.pagemap.workspace=portal/
+waf.pagemap.root=navigation/
+waf.pagemap.workspace=navigation/
 waf.pagemap.login_redirect=content/content-center-redirect.jsp
 
 com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
 com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+
 com.arsdigita.cms.disable_item_pfs=true
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
@@ -17,31 +22,44 @@ com.arsdigita.cms.hide_templates_tab=true
 com.arsdigita.cms.hide_admin_tabs=true
 com.arsdigita.cms.hide_timezone=true
 com.arsdigita.cms.hide_launch_date=true
+
 com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
 com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+
 com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
 com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
-com.arsdigita.cms.contenttypes.mparticle.template=resource:WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+com.arsdigita.cms.contenttypes.mparticle.template=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
 com.arsdigita.cms.hide_udct_ui=true
 com.arsdigita.cms.hide_folder_index_checkbox=true
 
-com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+;  atoz currently not in use
+;  com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
+com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
+com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
+com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
+com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
+
+; com.arsdigita.london.theme.default_theme_path=__ccm__/themes/shp
 com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws
 com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf
+com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
 com.arsdigita.london.search.show_sponsored_links=true
 
-com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
-waf.admin.email=admin@example.com
-waf.admin.name.given=Administrator
-waf.admin.name.family=Account
-waf.admin.password=123456
-waf.admin.password.question=12345
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes105neu?user\=zes&password\=zes47web
+waf.runtime.jdbc_pool_size=80
+waf.web.server=localhost\:9000
+
+waf.admin.email=webmaster@zes.uni-bremen.de
+waf.admin.name.given=ZeS 
+waf.admin.name.family=Administrator
+waf.admin.password=nge2015
+waf.admin.password.question=12345 
 waf.admin.password.answer=6
 
-com.arsdigita.aplaws.lite_load=true
-waf.debug=true
-waf.bebop.fancy_xsl_errors=true
+;  waf.debug=true
+;  waf.bebop.fancy_xsl_errors=true
+
diff --git a/ccm-zes-aplaws/bundles/devel/cfg/web.xml b/ccm-zes-aplaws/bundles/devel/cfg/web.xml
index fa23cc1c9..f242d889a 100644
--- a/ccm-zes-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-zes-aplaws/bundles/devel/cfg/web.xml
@@ -7,6 +7,22 @@
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
 
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+       NOT USED with ZeS                                        
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with ZeS standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -17,6 +33,18 @@
     <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
   </filter>
 
+<!--    NOT USED HERE
+  <filter-mapping>
+    <filter-name>secured</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>profiler</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+-->
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
     <url-pattern>/ccm/*</url-pattern>
@@ -125,7 +153,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -154,7 +181,8 @@
      MODULES SERVLET DECLARATIONS SECTION
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN
+       NOT USED with ZeS   
   <servlet>
     <servlet-name>atoz-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -163,7 +191,7 @@
       <param-value>/templates/ccm-ldn-atoz</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-atoz  -  servlet definitions END  -->
+       module ccm-ldn-atoz  -  servlet definitions END  -->
 
   <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
   <servlet>
@@ -172,8 +200,6 @@
   </servlet>
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
-<!-- XXX hack -->
-
   <servlet>
     <servlet-name>portal-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -470,7 +496,6 @@
      <url-pattern>/print/*</url-pattern>
  </servlet-mapping>
 
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      ERROR PAGES
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
diff --git a/ccm-zes-aplaws/bundles/standard/bundle.in b/ccm-zes-aplaws/bundles/standard/bundle.in
index 3fe020606..0bed0eda7 100644
--- a/ccm-zes-aplaws/bundles/standard/bundle.in
+++ b/ccm-zes-aplaws/bundles/standard/bundle.in
@@ -1,4 +1,4 @@
-BUNDLE_NAME=aplaws-plus-standard
-BUNDLE_PRETTY_NAME="APLAWS+ Standard Bundle"
+BUNDLE_NAME=aplaws-plus-shp
+BUNDLE_PRETTY_NAME="APLAWS+ SHP Standard Bundle"
 VERSION=1.0.5devel
 RELEASE=1
diff --git a/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg b/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg
index 87b8ac070..975ace0c0 100644
--- a/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg
+++ b/ccm-zes-aplaws/bundles/standard/cfg/applications.cfg
@@ -3,36 +3,76 @@ ccm-core
 ccm-cms
 
 # Content assets
-ccm-cms-assets-relatedlink
 ccm-cms-assets-fileattachment
-ccm-ldn-dublin
+ccm-cms-assets-notes
+ccm-cms-assets-relatedlink
 
 # Content types
-ccm-cms-types-contact
-ccm-cms-types-esdservice
+ccm-cms-types-address
+# -- ccm-cms-types-agenda
 ccm-cms-types-article
+ccm-cms-types-bookmark
+ccm-cms-types-contact
+# -- ccm-cms-types-esdservice
+ccm-cms-types-event
+#  --  faqitem koennte bei zes auch entfallen
+#      2008-06-07 auskommentiert, ist in Produktionssystem
+#      nicht enthalten und nicht anwählbar.
+# -- ccm-cms-types-faqitem
 ccm-cms-types-filestorageitem
-ccm-cms-types-mparticle
-ccm-cms-types-newsitem
-ccm-cms-types-pressrelease
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
-ccm-cms-types-inlinesite
-ccm-ldn-xmlfeed
+#  --  glossaryitem koennte bei zes auch entfallen
+#      2008-06-07 auskommentiert, ist in Produktionssystem
+#      nicht enthalten und nicht anwählbar.
+# -- ccm-cms-types-glossaryitem
+# -- ccm-cms-types-htmlform
+# -- ccm-cms-types-inlinesite
+# -- ccm-cms-types-job
+# -- ccm-cms-types-legalnotice
+# -- ccm-cms-types-minutes
+# -- ccm-cms-types-motditem
+ccm-cms-types-mparticle
+ccm-cms-types-newsitem
+# -- ccm-cms-types-organization
+# -- ccm-cms-types-pressrelease
+# -- ccm-cms-types-service
+ccm-cms-types-siteproxy
+
 
 # Applications
-ccm-ldn-util
-ccm-ldn-atoz
-ccm-ldn-rss
-ccm-ldn-portal
+# ------------
+# -- ccm-auth-http
+# -- ccm-bookmarks
+# -- ccm-docmngr    ## temp., produces errors in build
+# -- ccm-formbuilder-pdf
+ccm-forum
+ccm-simplesurvey
+ccm-user-preferences
+# -- ccm-weblog
+# -- ccm-webpage
+
+# ldn extensions
+# --------------
+# -- ccm-ldn-aplaws
+# -- ccm-ldn-atoz
+# -- ccm-ldn-dublin
+# -- ccm-ldn-exporter
+# -- ccm-ldn-freeform
+ccm-ldn-image-step
+# -- ccm-ldn-importer
 ccm-ldn-navigation
+ccm-ldn-portal
+ccm-ldn-rss
 ccm-ldn-search
 ccm-ldn-shortcuts
 ccm-ldn-subsite
 ccm-ldn-terms
-ccm-ldn-aplaws
-
-# Extra apps
-ccm-forum
-ccm-ldn-importer
 ccm-ldn-theme
+ccm-ldn-util
+#  --  xmlfeed wird moeglicherweise ebenfalls nicht gebraucht
+ccm-ldn-xmlfeed
+
+# zes extensions
+ccm-zes-aplaws
+
diff --git a/ccm-zes-aplaws/bundles/standard/cfg/integration.properties b/ccm-zes-aplaws/bundles/standard/cfg/integration.properties
index 4e96b08bc..fecf76d0a 100644
--- a/ccm-zes-aplaws/bundles/standard/cfg/integration.properties
+++ b/ccm-zes-aplaws/bundles/standard/cfg/integration.properties
@@ -1,15 +1,20 @@
+; in core: Sucht PatternStyleSheet, u.a. um passende localization zu finden
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
 waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
+;
 waf.kernel.data_permission_check_enabled=false
+waf.kernel.primary_user_identifier=email
 waf.dispatcher.default_expiry=3600
+
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-waf.pagemap.root=portal/
-waf.pagemap.workspace=portal/
+waf.pagemap.root=navigation/
+waf.pagemap.workspace=navigation/
 waf.pagemap.login_redirect=content/content-center-redirect.jsp
 
 com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
 com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
+
 com.arsdigita.cms.disable_item_pfs=true
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
@@ -17,20 +22,44 @@ com.arsdigita.cms.hide_templates_tab=true
 com.arsdigita.cms.hide_admin_tabs=true
 com.arsdigita.cms.hide_timezone=true
 com.arsdigita.cms.hide_launch_date=true
+
 com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
 com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+
 com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
 com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
-com.arsdigita.cms.contenttypes.mparticle.template=resource:WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+com.arsdigita.cms.contenttypes.mparticle.template=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=resource:///WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
 com.arsdigita.cms.hide_udct_ui=true
 com.arsdigita.cms.hide_folder_index_checkbox=true
 
-com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+;  atoz currently not in use
+;  com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
+com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
+com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
+com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
+com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
+
+; com.arsdigita.london.theme.default_theme_path=__ccm__/themes/shp
 com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws
 com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-aplaws.web.mf
+com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
 com.arsdigita.london.search.show_sponsored_links=true
 
-com.arsdigita.london.cms.dublin.audience_domain=LGAL
+
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes105neu?user\=zes&password\=zes47web
+waf.runtime.jdbc_pool_size=80
+waf.web.server=localhost\:9000
+
+waf.admin.email=webmaster@zes.uni-bremen.de
+waf.admin.name.given=ZeS 
+waf.admin.name.family=Administrator
+waf.admin.password=nge2015
+waf.admin.password.question=12345 
+waf.admin.password.answer=6
+
+;  waf.debug=true
+;  waf.bebop.fancy_xsl_errors=true
+
diff --git a/ccm-zes-aplaws/bundles/standard/cfg/web.xml b/ccm-zes-aplaws/bundles/standard/cfg/web.xml
index fa23cc1c9..f242d889a 100644
--- a/ccm-zes-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-zes-aplaws/bundles/standard/cfg/web.xml
@@ -7,6 +7,22 @@
   <display-name>CCM</display-name>
   <description>Content and Collaboration Management</description>
 
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+       NOT USED with ZeS                                        
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with ZeS standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -17,6 +33,18 @@
     <filter-class>com.arsdigita.london.subsite.SubsiteFilter</filter-class>
   </filter>
 
+<!--    NOT USED HERE
+  <filter-mapping>
+    <filter-name>secured</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>profiler</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+-->
+
   <filter-mapping>
     <filter-name>subsite</filter-name>
     <url-pattern>/ccm/*</url-pattern>
@@ -125,7 +153,6 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -154,7 +181,8 @@
      MODULES SERVLET DECLARATIONS SECTION
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN
+       NOT USED with ZeS   
   <servlet>
     <servlet-name>atoz-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -163,7 +191,7 @@
       <param-value>/templates/ccm-ldn-atoz</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-atoz  -  servlet definitions END  -->
+       module ccm-ldn-atoz  -  servlet definitions END  -->
 
   <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
   <servlet>
@@ -172,8 +200,6 @@
   </servlet>
   <!-- module ccm-forum  -  servlet declarations END    -->  
 
-<!-- XXX hack -->
-
   <servlet>
     <servlet-name>portal-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -470,7 +496,6 @@
      <url-pattern>/print/*</url-pattern>
  </servlet-mapping>
 
-
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      ERROR PAGES
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->