diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/cfg/integration.properties b/ccm-sci-bundle/bundles/local/jensp-dev/cfg/integration.properties
deleted file mode 100644
index 851dd14f0..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/cfg/integration.properties
+++ /dev/null
@@ -1,143 +0,0 @@
-# Scientific CMS devel bundle integration.properties
-#
-waf.bebop.base_page=com.arsdigita.bundle.ui.SimplePage
-#
-; dhtml editor to use (system wide)
-; Xinha is default
-; default: Xinha editor & src=/assets/xinha/XinhaLoader.js
-; To use FCKeditor configure:
-; waf.bebop.dhtml_editor=FCKeditor
-
-waf.categorization.show_internal_name=true
-
-waf.dispatcher.default_expiry=3600
-;
-waf.kernel.data_permission_check_enabled=false
-waf.kernel.primary_user_identifier=email
-; if you activate screen_name, forum loader does not work.
-; waf.kernel.primary_user_identifier=screen_name
-waf.kernel.supported_languages=de,en
-waf.kernel.language_independent_items=true
-
-; security.properties: 
-waf.auto_registration_on=false
-
-; Searches for localized style sheet (among others) 
-waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
-waf.templating.stylesheet_paths=/WEB-INF/resources/scientificCMS-stylesheet-paths.txt
-
-core.ui.pagemap.root_page_url=navigation/
-core.ui.pagemap.workspace_url=navigation/
-core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
-
-; workflow configuration
-waf.workflow.simple.alerts_enabled=true
-waf.workflow.simple.alerts_sender=root@localhost.localdomain
-
-; Configures the xml processing
-waf.xml.xsl_transformer=xalan
-waf.xml.activate_full_date_formatter=true
-
-# ccm-cms parameters
-
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.bundle.ui.ItemCategoryPicker
-
-com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
-com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
-com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatcher.SubsiteItemTemplateResolver
-
-; Configure dhtml editor for use in cms content-center
-; Xinha is default and does work out of the box
-; A CCM specific configuration file is used to prevent a mess with the standard
-; configuration, default is:
-; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js
-
-; to use FCKeditor:
-; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
-; com.arsdigita.cms.dhtml_editor_hidden_buttons=
-; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
-
-com.arsdigita.cms.disable_item_pfs=true
-
-com.arsdigita.cms.hide_admin_tabs=true
-com.arsdigita.cms.hide_folder_index_checkbox=true
-com.arsdigita.cms.hide_launch_date=true
-com.arsdigita.cms.hide_templates_tab=true
-com.arsdigita.cms.hide_timezone=true
-com.arsdigita.cms.hide_udct_ui=true
-
-com.arsdigita.cms.use_section_categories=false
-com.arsdigita.cms.use_streamlined_creation=true
-
-
-# ccm-cms-types-event parameters
-com.arsdigita.cms.contenttypes.event.hide_cost=true
-com.arsdigita.cms.contenttypes.event.hide_date_description=false
-com.arsdigita.cms.contenttypes.event.hide_event_type=true
-com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
-com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
-com.arsdigita.cms.contenttypes.event.use_html_date_description=false
-com.arsdigita.cms.contenttypes.event.start_year=2000
-com.arsdigita.cms.contenttypes.event.end_year_delta=5
-
-
-# ccm-cms-types-newsitem parameters
-com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
-com.arsdigita.cms.contenttypes.newsitem.start_year=2000
-com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
-
-
-# Forum application
-com.arsdigita.forum.show_new_tabs=true
-com.arsdigita.forum.use_wysiwyg_editor=true
-com.arsdigita.forum.allow_quick_finish=true
-com.arsdigita.forum.disable_page_caching=true
-
-
-# ccm-navigation application
-com.arsdigita.navigation.category_menu_show_grand_children=false
-com.arsdigita.navigation.default_cat_root_path=/navigation/
-com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp
-com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
-
-
-# ccm-search application
-com.arsdigita.london.search.show_sponsored_links=true
-
-
-# ccm-subsite application
-com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-
-
-# ccm-themedirector application
-themedirector.default_theme_context=
-#themedirector.default_theme_manifest=ccm-jp-aplaws.web.mf
-themedirector.default_theme_path=themes/static/aplaws-generic
-themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
-
-
-# ccm-sci-bundle (Loader only)
-#com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
-#com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu 
-#com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
-# =============================================================================================
-# runtime specific configurations
-
-waf.admin.email=webmaster@pwi.uni-bremen.de
-waf.admin.name.given=ScientificCMS
-waf.admin.name.family=Administrator
-waf.admin.password=nge2015
-waf.admin.password.question=12345
-waf.admin.password.answer=6
-
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm47web&stringtype\=unspecified
-waf.runtime.jdbc_pool_size=30
-
-waf.web.server=localhost\:8080
-
-
-# =============================================================================================
-# devel specific configurations
-waf.debug=true
-waf.bebop.fancy_xsl_errors=true
-
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/cfg/project.xml b/ccm-sci-bundle/bundles/local/jensp-dev/cfg/project.xml
deleted file mode 100644
index cbbaab11c..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/cfg/project.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--  project.xml SCI devel - containing only modules used for ScientificCMS  -->
-
-<ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
-               xmlns:ccm="http://ccm.redhat.com/ccm-project" 
-              ccmVersion="6.1" 
-                    name="ScientificCMS" 
-              prettyName="Scientific CMS" 
-                 version="1-1-6" 
-                 release="devel" 
-                  webxml="web-sci.xml" 
-                  webapp="ROOT" 
-      xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
-
-    <ccm:build>
-
-    <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-    <!--    Scientific CMS set of CORE packages                                  -->
-    <!--    NONE can be omitted for technical reasons / internal dependencies    -->
-    <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-    
-    <!--   Main apps   -->
-        <ccm:application name="ccm-core"/>
-        <ccm:application name="ccm-cms"/>
-    
-    <!--   Content Assets   -->
-        <ccm:application name="ccm-cms-assets-imagestep"/>
-        <ccm:application name="ccm-cms-assets-relatedlink"/>
-    
-    <!--   Content Types   -->
-        <ccm:application name="ccm-cms-types-article"/>
-        <ccm:application name="ccm-cms-types-filestorageitem"/>
-        <ccm:application name="ccm-cms-types-formitem"/>
-        <ccm:application name="ccm-cms-types-formsectionitem"/>
-    
-    <!--   Applications   -->
-        <ccm:application name="ccm-navigation"/>
-        <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-themedirector"/>
-        <ccm:application name="ccm-subsite"/>                    
-    
-    <!--   LDN extension  -->
-        <ccm:application name="ccm-ldn-search"/>
-        <ccm:application name="ccm-ldn-shortcuts"/>
-        <ccm:application name="ccm-ldn-terms"/>
-        <ccm:application name="ccm-ldn-util"/>
-    
-    <!--   SCI extension  -->
-        <ccm:application name="ccm-sci-bundle"/>
-    
-    
-    
-    <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-    <!--    Scientific CMS  OPTIONAL packages                                    -->
-    <!--    Various combinations of these packages make up specific editions     -->
-    <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-    
-    <!--   Content Assets   -->
-        <ccm:application name="ccm-cms-assets-fileattachment"/>
-        <ccm:application name="ccm-cms-assets-notes"/>
-    
-    <!--   Content Types   -->
-        <ccm:application name="ccm-cms-types-address"/>
-        <ccm:application name="ccm-cms-types-bookmark"/>
-        <ccm:application name="ccm-cms-types-contact"/>
-        <ccm:application name="ccm-cms-types-event"/>
-        <ccm:application name="ccm-cms-types-image"/>
-        <ccm:application name="ccm-cms-types-mparticle"/>
-        <ccm:application name="ccm-cms-types-newsitem"/>
-        <ccm:application name="ccm-cms-types-person"/>
-
-    <!--   Applications   -->
-        <ccm:application name="ccm-cms-publicpersonalprofile"/>
-        <ccm:application name="ccm-portalserver"/>
-    
-    <!--   LDN extension  -->
-    <!--    temporyrily excluded because configuration has to be cleared
-	 <ccm:application name="ccm-ldn-rss"/>                        
-    -->
-
-    <!--   SCI extension  -->    
-        <ccm:application name="ccm-sci-personalprojects"/>    
-        <ccm:application name="ccm-sci-personalpublications"/>
-        <ccm:application name="ccm-sci-publications"/>
-        <ccm:application name="ccm-sci-types-department"/>
-        <ccm:application name="ccm-sci-types-institute"/>
-        <ccm:application name="ccm-sci-types-member"/>
-        <ccm:application name="ccm-sci-types-project"/>
-    
-   
-    <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-    <!--    Scientific CMS   potential ADD-ONS packages                          -->
-    <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-    
-    <!--   Content Types   -->
-    
-    <!--<ccm:application name="ccm-cms-types-agenda"/>-->
-    <!--<ccm:application name="ccm-cms-types-faqitem"/>-->
-    <!--<ccm:application name="ccm-cms-types-glossaryitem"/>-->
-    <!--<ccm:application name="ccm-cms-types-htmlform"/>-->
-    <!--<ccm:application name="ccm-cms-types-inlinesite"/>-->
-    <!--<ccm:application name="ccm-cms-types-job"/>-->
-    <!--<ccm:application name="ccm-cms-types-legalnotice"/>-->
-    <!--<ccm:application name="ccm-cms-types-minutes"/>-->
-    <!--<ccm:application name="ccm-cms-types-organization"/>-->
-    <!--<ccm:application name="ccm-cms-types-pressrelease"/>-->
-    <!--<ccm:application name="ccm-cms-types-service"/>-->
-        <ccm:application name="ccm-cms-types-siteproxy"/>
-        <ccm:application name="ccm-cms-types-xmlfeed"/>
-    
-
-    <!--   Applications   -->
-    <!--
-	<ccm:application name="ccm-auth-http"/>
-	<ccm:application name="ccm-bookmarks"/>
-	<ccm:application name="ccm-docmgr"/>
-    -->
-        <ccm:application name="ccm-docrepo"/>
-        <ccm:application name="ccm-forum"/>  
-        <ccm:application name="ccm-forum-categorised"/>
-    <!--
-	<ccm:application name="ccm-weblog"/>
-	<ccm:application name="ccm-webpage"/>
-    -->
-    
-    <!--   LDN extension  -->
-    
-        <ccm:application name="ccm-ldn-exporter"/>
-    <!--        <ccm:application name="ccm-ldn-freeform"/> -->
-        <ccm:application name="ccm-ldn-importer"/>
-    
-    
-    </ccm:build>
-
-
-  <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-  <!--    Scientific CMS   list of OBSOLETE modules                            -->
-  <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-  
-  <!--   Content Types   -->
-  <!--    Without known funcionality
-       <ccm:application name="ccm-cms-types-motditem"/>             -->
-  
-  <!--   Applications   -->
-  <!--    currently doesn't work for unknown reason
-       <ccm:application name="ccm-simplesurvey"/>                   -->
-  <!--    Without known funcionality
-       <ccm:application name="ccm-formbuilder-pdf"/>
-       <ccm:application name="ccm-user-preferences"/>               -->
-  
-  <!--   LDN extension  -->
-  <!--    Conflicts with ccm-sci-bundle (this package)                 -->
-  <!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
-  <!--    In it's current implementation very ldn / aplaws specific
-       <ccm:application name="ccm-ldn-atoz"/>  
-       <ccm:application name="ccm-ldn-dublin"/>                     -->
-  
-  
-  <!-- tools will be downloaded from trunk, but does not
-       contain java code to be compiled!
-       <ccm:application name="tools"/>           -->
-
-</ccm:project>
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/cfg/web-sci.xml b/ccm-sci-bundle/bundles/local/jensp-dev/cfg/web-sci.xml
deleted file mode 100644
index 69abc6f99..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/cfg/web-sci.xml
+++ /dev/null
@@ -1,601 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-               version="2.4">
-
-  <display-name>Scientific CMS</display-name> 
-  <description>Content and Collaboration Management for Scientific Institutions</description>
-
-  <!-- path and filename of the log4j user accessible config file
-       WEB-INF/conf/log4j.properties is the built-in default value -->
-  <context-param>
-    <param-name>log4j-conf-file</param-name>
-    <param-value>WEB-INF/conf/log4j.properties</param-value>
-  </context-param>
-
-
-  <!-- Require secure connection by redirect to host-port part
-       of parameter waf.web.secure_server               
-  <filter>
-    <filter-name>secured</filter-name>
-    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
-  </filter>
-  -->
-  <!-- Initialize Profiler timers
-       NOT USED with 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.shortcuts.ShortcutFilter</filter-class>
-  </filter>
-
-  <filter>
-    <filter-name>subsite</filter-name>
-    <filter-class>com.arsdigita.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>/*</url-pattern>
-  </filter-mapping>
-
-  <filter-mapping>
-    <filter-name>shortcuts</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     Context Listener 
-     required and used to initialize the runtime environment before any other 
-     task is performed or any servlet initialized. 
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <listener>
-    <listener-class>com.arsdigita.web.CCMApplicationContextListener</listener-class>
-  </listener>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     BASE SERVLET DECLARATIONS SECTION
-     basically requirred by ccm-core
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet>
-    <servlet-name>reg</servlet-name>
-    <servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class>
-    <init-param>
-      <param-name>uri</param-name>
-      <param-value>/</param-value>
-    </init-param>
-    <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>
-  </servlet>
-
-  <servlet>
-    <servlet-name>db-test</servlet-name>
-    <servlet-class>com.arsdigita.web.monitoring.DBTestServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>versioning-log</servlet-name>
-    <servlet-class>com.arsdigita.versioning.VersioningServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>webdevsupport</servlet-name>
-    <servlet-class>com.arsdigita.webdevsupport.WebDevSupportServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>webadmin</servlet-name>
-    <servlet-class>com.arsdigita.ui.admin.AdminServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>webadmin-sitemap</servlet-name>
-    <servlet-class>com.arsdigita.ui.sitemap.SiteMapServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>webadmin-permissions</servlet-name>
-    <servlet-class>com.arsdigita.ui.permissions.PermissionsServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>oid-redirect</servlet-name>
-    <servlet-class>com.arsdigita.web.OIDRedirectServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>resource-resolver</servlet-name>
-    <servlet-class>com.arsdigita.web.ResourceServlet</servlet-class>
-  </servlet>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ADDITIONAL SERVLET DECLARATIONS SECTION 
-     basically requirred by ccm-cms
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet>
-    <servlet-name>content-center</servlet-name>
-    <servlet-class>com.arsdigita.cms.WorkspaceServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>content-section</servlet-name>
-    <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>cms-service</servlet-name>
-    <servlet-class>com.arsdigita.cms.ServiceServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>content-type-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>content-item-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>template-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
-  </servlet>
-
- <servlet>
-   <servlet-name>TextOnlyServlet</servlet-name>
-   <display-name>Text Only Servlet</display-name>
-   <servlet-class>
-    com.arsdigita.web.InternalPrefixerServlet
-   </servlet-class>
-   <init-param>
-     <param-name>prefix</param-name>
-     <param-value>/text</param-value>
-   </init-param>
- </servlet>
-
- <servlet>
-   <servlet-name>PrintFriendlyServlet</servlet-name>
-   <display-name>Printer Friendly Output Servlet</display-name>
-   <servlet-class>
-    com.arsdigita.web.InternalPrefixerServlet
-   </servlet-class>
-   <init-param>
-     <param-name>prefix</param-name>
-     <param-value>/print</param-value>
-   </init-param>
- </servlet>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     MODULES SERVLET DECLARATIONS SECTION
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-  <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
-  <servlet>
-    <servlet-name>forum-main</servlet-name>
-    <servlet-class>com.arsdigita.forum.ForumServlet</servlet-class>
-  </servlet>
-  <!-- module ccm-forum  -  servlet declarations END    -->  
-
-  <servlet>
-    <servlet-name>portalworkspace-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-portalworkspace</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>navigation-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-navigation</param-value>
-    </init-param>
-    <init-param>
-      <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>portlet-type-xsl</servlet-name>
-    <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
-  </servlet>
- 
-  <!-- module ccm-rssfeed  -  servlet declaration BEGIN   -->
-  <servlet>
-    <servlet-name>rssfeed-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-rssfeed</param-value>
-    </init-param>
-    <init-param>
-      <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.rssfeed.RSSFileResolver</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-rssfeed  -  servlet declaration END   -->
-
-  <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
-  <servlet>
-    <servlet-name>worker</servlet-name>
-    <servlet-class>com.arsdigita.london.search.SearchWorkerServlet</servlet-class>
-    <load-on-startup>4</load-on-startup>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>search-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-search</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-    <servlet-name>AxisServlet</servlet-name>
-    <display-name>Apache-Axis Servlet</display-name>
-    <servlet-class>
-     org.apache.axis.transport.http.AxisServlet
-    </servlet-class>
-  </servlet>
-  <!-- module ccm-ldn-search  -  servlet declarations END  -->
-
-  <!-- module ccm-shortcuts  -  servlet definitions   -->
-  <servlet>
-    <servlet-name>shortcuts-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-shortcuts</param-value>
-    </init-param>
-  </servlet>
-
-  <!-- module ccm-subsite  -  servlet declarations BEGIN  -->
-  <servlet>
-    <servlet-name>subsite-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-subsite</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-subsite  -  servlet declarations END  -->
-
-  <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
-  <servlet>
-    <servlet-name>terms-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-terms</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-ldn-terms  -  servlet declarations END   -->
-
-  <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
-  <servlet>
-    <servlet-name>theme-files</servlet-name>
-    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
-    <init-param>
-      <param-name>template-path</param-name>
-      <param-value>/templates/ccm-themedirector</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet>
-     <servlet-name>ThemeDownload</servlet-name>
-     <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>ThemePreviewServlet</servlet-name>
-     <display-name>Servlet to allow admins to preview look/feel</display-name>
-    <servlet-class>
-     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
-    </servlet-class>
-    <init-param>
-      <param-name>prefix</param-name>
-      <param-value>/theme</param-value>
-    </init-param>
-  </servlet>
-  <!-- module ccm-themedirector  -  servlet declarations END   -->
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     MODULES SERVLET MAPPINGS SECTION
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
-  <!-- module ccm-forum  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>forum-main</servlet-name>
-    <url-pattern>/forum-main/main/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-forum  -  servlet mappings END    -->
-
-  <servlet-mapping>
-    <servlet-name>portlet-type-xsl</servlet-name>
-    <url-pattern>/themes/servlet/portlet-type/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>portalworkspace-files</servlet-name>
-    <url-pattern>/ccm-portalworkspace/files/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-navigation/files/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- module ccm-rssfeed  -  servlet mappings  BEGIN   -->
-  <servlet-mapping>
-    <servlet-name>rssfeed-files</servlet-name>
-    <url-pattern>/ccm-rssfeed/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-rssfeed  -  servlet mappings  END   -->
-
-  <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>search-files</servlet-name>
-    <url-pattern>/ccm-ldn-search/files/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>AxisServlet</servlet-name>
-    <url-pattern>/services/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-ldn-search  -  servlet mappings END  -->
-
-  <!-- module ccm-shortcuts  -  servlet mappings   -->
-  <servlet-mapping>
-    <servlet-name>shortcuts-files</servlet-name>
-    <url-pattern>/ccm-shortcuts/files/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- module ccm-subsite  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>subsite-files</servlet-name>
-    <url-pattern>/ccm-subsite/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-subsite  -  servlet mappings END  -->
-
-  <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
-  <servlet-mapping>
-    <servlet-name>terms-files</servlet-name>
-    <url-pattern>/ccm-ldn-terms/files/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-ldn-terms  -  servlet mappings END  -->
-
-  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
-  <servlet-mapping>
-    <servlet-name>theme-files</servlet-name>
-    <url-pattern>/theme-files/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>ThemeDownload</servlet-name>
-    <url-pattern>/theme-files/download/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>ThemePreviewServlet</servlet-name>
-    <url-pattern>/theme/*</url-pattern>
-  </servlet-mapping>
-  <!-- module ccm-themedirector  -  servlet mappings END   -->
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     BASE SERVLET MAPPINGS SECTION
-     basically requirred by ccm-core
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet-mapping>
-    <servlet-name>reg</servlet-name>
-    <url-pattern>/themes/null/reg/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <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>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>db-test</servlet-name>
-    <url-pattern>/dbtest</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>versioning-log</servlet-name>
-    <url-pattern>/versioning/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>webdevsupport</servlet-name>
-    <url-pattern>/webdevsupport/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>webadmin</servlet-name>
-    <url-pattern>/admin/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>webadmin-sitemap</servlet-name>
-    <url-pattern>/admin-sitemap/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>webadmin-permissions</servlet-name>
-    <url-pattern>/admin-permissions/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>oid-redirect</servlet-name>
-    <url-pattern>/redirect/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>resource-resolver</servlet-name>
-    <url-pattern>/resource/*</url-pattern>
-  </servlet-mapping>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ADDITIONAL SERVLET MAPPINGS SECTION
-     basically requirred by ccm-cms
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <servlet-mapping>
-    <servlet-name>content-center</servlet-name>
-    <url-pattern>/templates/servlet/content-center/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>content-section</servlet-name>
-    <url-pattern>/templates/servlet/content-section/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>cms-service</servlet-name>
-    <url-pattern>/templates/servlet/cms-service/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/templates/servlet/content-item/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>content-type-xsl</servlet-name>
-    <url-pattern>/themes/servlet/content-type/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>template-xsl</servlet-name>
-    <url-pattern>/themes/servlet/template/*</url-pattern>
-  </servlet-mapping>
-
- <servlet-mapping>
-     <servlet-name>TextOnlyServlet</servlet-name>
-     <url-pattern>/text/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
-     <servlet-name>PrintFriendlyServlet</servlet-name>
-     <url-pattern>/print/*</url-pattern>
- </servlet-mapping>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     ERROR PAGES
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <error-page>
-    <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type>
-    <location>/error/access-denied.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>com.arsdigita.dispatcher.ObjectNotFoundException</exception-type>
-    <location>/error/object-not-found.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>com.arsdigita.kernel.permissions.PermissionException</exception-type>
-    <location>/error/permission-denied.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>com.arsdigita.persistence.DbNotAvailableException</exception-type>
-    <location>/error/db-not-available.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>com.arsdigita.db.DbNotAvailableException</exception-type>
-    <location>/error/db-not-available.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>java.lang.Exception</exception-type>
-    <location>/error/general.jsp</location>
-  </error-page>
-
-  <error-page>
-    <exception-type>java.lang.Error</exception-type>
-    <location>/error/general.jsp</location>
-  </error-page>
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-     TAG LIBS
-     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
-  </taglib>
-
-  <taglib>
-    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
-    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
-  </taglib>
-
-</web-app>
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/dummy b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/dummy
deleted file mode 100644
index f9c053b8b..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/dummy
+++ /dev/null
@@ -1 +0,0 @@
-Dummy file for developing & testing purpose
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/placeholder.info b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/placeholder.info
deleted file mode 100644
index 5ae76207c..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/placeholder.info
+++ /dev/null
@@ -1,3 +0,0 @@
-Subdirectory  <cat> may optionally contain one or more local site specific 
-import xml files for Terms domain categories. 
-
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/sci-nav-domain-1.00.xml b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/sci-nav-domain-1.00.xml
deleted file mode 100644
index 31486e212..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/sci-nav-domain-1.00.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Document   : domain-nav-sci-1.00.xml
-    Created on : 8. Aug. 2007, 10:00
-    Author     : pb
-    Description:
-        Definition of the terms (categories) in the SHP Navigation Menue.
-        In hierarchy-nav-shp the structure of the tree will be defined.
--->
-
-<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" 
-              about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml" 
-              key="STD-NAV" 
-              title="Sci Navigation List" 
-              version="1.00" released="2007-08-10">
-
-  <terms:term id="1000" name="Institut" inAtoZ="false"/>
-    <terms:term id="1200" name="Abteilungen" inAtoZ="false"/>
-      <terms:term id="1220" name="Abteilung 1" inAtoZ="false"/>
-      <terms:term id="1240" name="Abteilung 2" inAtoZ="false"/>
-      <terms:term id="1260" name="Abteilung 3" inAtoZ="false"/>
-      <terms:term id="1280" name="Abteilung 4" inAtoZ="false"/>
-      <terms:term id="1300" name="Abteilung 5" inAtoZ="false"/>
-    <terms:term id="1400" name="Mitglieder" inAtoZ="false"/>
-    <terms:term id="1600" name="Bibliothek" inAtoZ="false"/>
-    <terms:term id="1800" name="Ankündigungen" inAtoZ="false"/>
-  
-  <terms:term id="3000" name="Forschung" inAtoZ="false"/>
-    <terms:term id="3200" name="Projekte" inAtoZ="false"/>
-    <terms:term id="3400" name="Veröffentlichungen" inAtoZ="false"/>
-      <terms:term id="3420" name="Publikationen" inAtoZ="false"/>
-      <terms:term id="3440" name="Arbeitspapiere" inAtoZ="false"/>
-      <terms:term id="3460" name="Schriftenreihe" inAtoZ="false"/>
-      <terms:term id="3480" name="Sci Report" inAtoZ="false"/>
-      <terms:term id="3500" name="Jahresberichte" inAtoZ="false"/>
-    <terms:term id="3600" name="Kolloquium" inAtoZ="false"/>
-    <terms:term id="3800" name="Jour Fix" inAtoZ="false"/>
-    <terms:term id="4000" name="Tagungen" inAtoZ="false"/>
-  
-  <terms:term id="5000" name="Lehre und Studium" inAtoZ="false"/>
-    <terms:term id="5200" name="Masterstudiengang Sci" inAtoZ="false"/>
-    <terms:term id="5400" name="Weitere Lehre" inAtoZ="false"/>
-    
-  <terms:term id="9002" name="Archiv" inAtoZ="false"/>
-  <terms:term id="9200" name="Informative Links" inAtoZ="false"/>
-
-</terms:domain>
-
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/sci-nav-hierarchy-1.00.xml b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/sci-nav-hierarchy-1.00.xml
deleted file mode 100644
index cfce50400..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/sci-nav-hierarchy-1.00.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Document   : hierarchy-nav-sci-1.00.xml
-    Created on : 8. Aug. 2007, 10:30
-    Author     : pb
-    Description:
-        Purpose of the document follows.
--->
-
-<terms:hierarchy xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
-  <terms:domain resource="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml"/>
-  <!-- set root terms  -->
-  <terms:term id="1000"/>
-  <terms:term id="3000"/>
-  <terms:term id="5000"/>
-  
-  <terms:orderedPair>
-    <!-- narrower terms, first level  -->  
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1200"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <!--  narrower terms, second level  -->
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1200"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1220"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1200"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1240"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1200"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1260"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1200"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1280"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1200"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1300"/>
-    </terms:destination>
-  </terms:orderedPair>
-<!--  narrower terms, second level END  -->
-  
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1400"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1600"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1800"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="9002"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="9200"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3200"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3400"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <!--  narrower terms, second level  -->
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3400"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3420"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3400"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3440"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3400"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3460"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3400"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3480"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3400"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3500"/>
-    </terms:destination>
-  </terms:orderedPair>
-<!--  narrower terms, second level END  -->
-  
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3600"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3800"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="4000"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="5000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5200"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="5000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5200"/>
-    </terms:destination>
-  </terms:orderedPair>
-  
-  </terms:hierarchy>
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-domain.xml b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-domain.xml
deleted file mode 100644
index 87ee0c8c2..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-domain.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0"?>
-<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" 
-              about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml" 
-              key="APLAWS-NAV" 
-              title="APLAWS Navigation List" 
-              version="1.03" released="2004-03-24">
-                  
-  <terms:term id="1" name="Business" inAtoZ="false"/>
-  <terms:term id="1007" name="Jobs and careers" inAtoZ="false"/>
-  <terms:term id="1021" name="Legal services" inAtoZ="false"/>
-  <terms:term id="1039" name="Leisure and culture" inAtoZ="false"/>
-  <terms:term id="1286" name="Policing and public safety" inAtoZ="false"/>
-  <terms:term id="1325" name="Social issues" inAtoZ="false"/>
-  <terms:term id="1337" name="Transport and streets" inAtoZ="false"/>
-  <terms:term id="204" name="Education and learning" inAtoZ="false"/>
-  <terms:term id="281" name="Environment" inAtoZ="false"/>
-  <terms:term id="3088" name="Council, government and democracy" inAtoZ="false"/>
-  <terms:term id="3168" name="Obsolete terms" inAtoZ="false"/>
-  <terms:term id="596" name="Health and social care" inAtoZ="false"/>
-  <terms:term id="93" name="Community and living" inAtoZ="false"/>
-  <terms:term id="946" name="Housing" inAtoZ="false"/>
-  <terms:term id="11" name="Business promotion" inAtoZ="false"/>
-  <terms:term id="15" name="Business property" inAtoZ="false"/>
-  <terms:term id="1523" name="Business procurement" inAtoZ="false"/>
-  <terms:term id="21" name="Business sectors and services" inAtoZ="false"/>
-  <terms:term id="3100" name="Workers' co-operatives" inAtoZ="false"/>
-  <terms:term id="3300" name="Business and street trading licences" inAtoZ="false"/>
-  <terms:term id="3323" name="Business support and advice" inAtoZ="false"/>
-  <terms:term id="3329" name="Imports and exports" inAtoZ="false"/>
-  <terms:term id="5" name="Business finance" inAtoZ="false"/>
-  <terms:term id="59" name="Economic development" inAtoZ="false"/>
-  <terms:term id="62" name="Employing people" inAtoZ="false"/>
-  <terms:term id="66" name="Health and safety" inAtoZ="false"/>
-  <terms:term id="70" name="Trading standards" inAtoZ="false"/>
-  <terms:term id="8" name="Business opportunities" inAtoZ="false"/>
-  <terms:term id="1008" name="Finding work" inAtoZ="false"/>
-  <terms:term id="1017" name="Retirement" inAtoZ="false"/>
-  <terms:term id="1026" name="Legal advice" inAtoZ="false"/>
-  <terms:term id="1029" name="Courts" inAtoZ="false"/>
-  <terms:term id="1037" name="Probation" inAtoZ="false"/>
-  <terms:term id="1308" name="Police" inAtoZ="false"/>
-  <terms:term id="1309" name="Prisons" inAtoZ="false"/>
-  <terms:term id="1326" name="Equal opportunities" inAtoZ="false"/>
-  <terms:term id="2083" name="Legislation" inAtoZ="false"/>
-  <terms:term id="3025" name="Civil and human rights" inAtoZ="false"/>
-  <terms:term id="3441" name="Legal professions" inAtoZ="false"/>
-  <terms:term id="3442" name="Young offending" inAtoZ="false"/>
-  <terms:term id="1041" name="Arts and entertainment" inAtoZ="false"/>
-  <terms:term id="1098" name="Children's activities" inAtoZ="false"/>
-  <terms:term id="1102" name="Libraries" inAtoZ="false"/>
-  <terms:term id="1106" name="Local history and heritage" inAtoZ="false"/>
-  <terms:term id="1113" name="Hobbies and interests" inAtoZ="false"/>
-  <terms:term id="1132" name="Parks and recreation" inAtoZ="false"/>
-  <terms:term id="1164" name="Social clubs" inAtoZ="false"/>
-  <terms:term id="1165" name="Sports" inAtoZ="false"/>
-  <terms:term id="1248" name="Tourism and travel" inAtoZ="false"/>
-  <terms:term id="1258" name="Uniformed groups" inAtoZ="false"/>
-  <terms:term id="1261" name="Young people's activities" inAtoZ="false"/>
-  <terms:term id="1482" name="Museums and galleries" inAtoZ="false"/>
-  <terms:term id="1287" name="Accidents, emergencies and safety" inAtoZ="false"/>
-  <terms:term id="1298" name="Coastguard" inAtoZ="false"/>
-  <terms:term id="1299" name="Crime and law enforcement" inAtoZ="false"/>
-  <terms:term id="1310" name="Victim support" inAtoZ="false"/>
-  <terms:term id="1311" name="Discrimination or harassment" inAtoZ="false"/>
-  <terms:term id="3454" name="Fire fighting and rescue services" inAtoZ="false"/>
-<!-- bug: this appears twice (look up a bit)
-  <terms:term id="1326" name="Equal opportunities" inAtoZ="false"/>
--->
-  <terms:term id="1327" name="Identity cards" inAtoZ="false"/>
-  <terms:term id="1328" name="Immigration and nationality" inAtoZ="false"/>
-  <terms:term id="1329" name="Sexual orientation" inAtoZ="false"/>
-  <terms:term id="1331" name="Firearms" inAtoZ="false"/>
-  <terms:term id="1332" name="Population and migration" inAtoZ="false"/>
-  <terms:term id="1333" name="Privacy and data protection" inAtoZ="false"/>
-  <terms:term id="1335" name="Rural communities" inAtoZ="false"/>
-  <terms:term id="1336" name="Social inclusion" inAtoZ="false"/>
-  <terms:term id="697" name="Family planning" inAtoZ="false"/>
-  <terms:term id="1352" name="Public rights of way" inAtoZ="false"/>
-  <terms:term id="1353" name="Motor vehicles, roads and parking" inAtoZ="false"/>
-  <terms:term id="1388" name="Public transport" inAtoZ="false"/>
-  <terms:term id="1402" name="Road and pathway maintenance" inAtoZ="false"/>
-  <terms:term id="1424" name="Transport planning" inAtoZ="false"/>
-  <terms:term id="3457" name="Ports and harbours" inAtoZ="false"/>
-  <terms:term id="3459" name="Waterways" inAtoZ="false"/>
-  <terms:term id="3461" name="Reservoirs" inAtoZ="false"/>
-  <terms:term id="205" name="Educational institutions" inAtoZ="false"/>
-  <terms:term id="206" name="Distance learning" inAtoZ="false"/>
-  <terms:term id="212" name="Language tuition" inAtoZ="false"/>
-  <terms:term id="219" name="Adult and community education" inAtoZ="false"/>
-  <terms:term id="2237" name="Teaching" inAtoZ="false"/>
-  <terms:term id="238" name="Work based learning" inAtoZ="false"/>
-  <terms:term id="280" name="Youth service" inAtoZ="false"/>
-  <terms:term id="3008" name="Higher education" inAtoZ="false"/>
-  <terms:term id="3345" name="Home education" inAtoZ="false"/>
-  <terms:term id="3346" name="School library service" inAtoZ="false"/>
-  <terms:term id="3347" name="Schools and colleges" inAtoZ="false"/>
-  <terms:term id="3359" name="Education welfare services" inAtoZ="false"/>
-  <terms:term id="3366" name="Youth support" inAtoZ="false"/>
-  <terms:term id="3440" name="Job training and development" inAtoZ="false"/>
-  <terms:term id="284" name="Animal welfare" inAtoZ="false"/>
-  <terms:term id="3374" name="Land and premises" inAtoZ="false"/>
-  <terms:term id="3379" name="Pests and nuisance" inAtoZ="false"/>
-  <terms:term id="3391" name="Pollution" inAtoZ="false"/>
-  <terms:term id="3393" name="Street care and cleaning" inAtoZ="false"/>
-  <terms:term id="3400" name="Town centre management" inAtoZ="false"/>
-  <terms:term id="347" name="Food production and quality" inAtoZ="false"/>
-  <terms:term id="372" name="Planning" inAtoZ="false"/>
-  <terms:term id="409" name="Energy" inAtoZ="false"/>
-  <terms:term id="420" name="Rubbish, waste and recycling" inAtoZ="false"/>
-  <terms:term id="451" name="Weather" inAtoZ="false"/>
-  <terms:term id="13" name="Information management" inAtoZ="false"/>
-  <terms:term id="3116" name="Democratic processes and events" inAtoZ="false"/>
-  <terms:term id="3344" name="Data protection and freedom of information" inAtoZ="false"/>
-  <terms:term id="454" name="Central government" inAtoZ="false"/>
-  <terms:term id="459" name="Councils" inAtoZ="false"/>
-  <terms:term id="524" name="Elections" inAtoZ="false"/>
-  <terms:term id="552" name="European affairs" inAtoZ="false"/>
-  <terms:term id="566" name="International affairs" inAtoZ="false"/>
-  <terms:term id="569" name="Non-governmental organisations" inAtoZ="false"/>
-  <terms:term id="584" name="Political parties" inAtoZ="false"/>
-  <terms:term id="592" name="Public services" inAtoZ="false"/>
-  <terms:term id="593" name="Regional governments" inAtoZ="false"/>
-  <terms:term id="178" name="Village newsletters" inAtoZ="false"/>
-  <terms:term id="462" name="Council documents, facts and figures" inAtoZ="false"/>
-  <terms:term id="514" name="Petitions" inAtoZ="false"/>
-  <terms:term id="515" name="Surveys" inAtoZ="false"/>
-  <terms:term id="597" name="Health and medical care" inAtoZ="false"/>
-  <terms:term id="631" name="Disabilities" inAtoZ="false"/>
-  <terms:term id="856" name="Social policy" inAtoZ="false"/>
-  <terms:term id="860" name="Social services" inAtoZ="false"/>
-  <terms:term id="107" name="Ethnic communities" inAtoZ="false"/>
-  <terms:term id="1302" name="Community safety" inAtoZ="false"/>
-  <terms:term id="1527" name="Life events" inAtoZ="false"/>
-  <terms:term id="182" name="Twinning" inAtoZ="false"/>
-  <terms:term id="184" name="Voluntary organisations" inAtoZ="false"/>
-  <terms:term id="201" name="Volunteering" inAtoZ="false"/>
-  <terms:term id="3013" name="Neighbourhood and village" inAtoZ="false"/>
-  <terms:term id="3101" name="Interpreters' services" inAtoZ="false"/>
-  <terms:term id="3118" name="Charities and citizens' interest groups" inAtoZ="false"/>
-  <terms:term id="3330" name="Community grants" inAtoZ="false"/>
-  <terms:term id="3332" name="Faiths, beliefs and religions" inAtoZ="false"/>
-  <terms:term id="95" name="Consumer advice and protection" inAtoZ="false"/>
-  <terms:term id="1627" name="Supported and sheltered housing" inAtoZ="false"/>
-  <terms:term id="2639" name="Private housing" inAtoZ="false"/>
-  <terms:term id="3424" name="Housing associations and co-operatives" inAtoZ="false"/>
-  <terms:term id="3426" name="Housing finance" inAtoZ="false"/>
-  <terms:term id="3430" name="Housing improvement and repairs" inAtoZ="false"/>
-  <terms:term id="3438" name="Multiple occupancy homes" inAtoZ="false"/>
-  <terms:term id="952" name="Housing advice" inAtoZ="false"/>
-  <terms:term id="960" name="Council housing" inAtoZ="false"/>
-</terms:domain>
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-hierarchy.xml b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-hierarchy.xml
deleted file mode 100644
index ed6c7c16b..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-hierarchy.xml
+++ /dev/null
@@ -1,1034 +0,0 @@
-<?xml version="1.0"?>
-<terms:hierarchy xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
-  <terms:domain resource="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml"/>
-  <terms:term id="1"/>
-  <terms:term id="1007"/>
-  <terms:term id="1021"/>
-  <terms:term id="1039"/>
-  <terms:term id="1286"/>
-  <terms:term id="1325"/>
-  <terms:term id="1337"/>
-  <terms:term id="204"/>
-  <terms:term id="281"/>
-  <terms:term id="3088"/>
-  <terms:term id="3168"/>
-  <terms:term id="596"/>
-  <terms:term id="93"/>
-  <terms:term id="946"/>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="11"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="15"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1523"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="21"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3100"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3300"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3323"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3329"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="59"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="62"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="66"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="70"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="8"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1007"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1008"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1007"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1017"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1021"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1026"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1021"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1029"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1021"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1037"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1021"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1308"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1021"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1309"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1021"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1326"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1021"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="2083"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1021"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3025"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1021"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3441"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1021"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3442"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1041"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1098"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1102"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1106"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1113"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1132"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="false">
-      <terms:term id="1164"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1165"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1248"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1258"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1261"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1039"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1482"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1286"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1287"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1286"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1298"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1286"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1299"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1286"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1310"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1286"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1311"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1286"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3454"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1325"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1326"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1325"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1327"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1325"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1328"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1325"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1329"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1325"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1331"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1325"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1332"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1325"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1333"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1325"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1335"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1325"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1336"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1325"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="697"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1337"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1352"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1337"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1353"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1337"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1388"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1337"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1402"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1337"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1424"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1337"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3457"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1337"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3459"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1337"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3461"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="205"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="206"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="212"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="219"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="2237"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="238"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="280"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3008"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3345"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3346"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3347"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3359"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3366"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="204"/>
-    </terms:source>
-    <terms:destination isDefault="false" isPreferred="true">
-      <terms:term id="3440"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="281"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="284"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="281"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3374"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="281"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3379"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="281"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3391"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="281"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3393"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="281"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3400"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="281"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="347"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="281"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="372"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="281"/>
-    </terms:source>
-    <terms:destination isDefault="false" isPreferred="true">
-      <terms:term id="409"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="281"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="420"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="281"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="451"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="13"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3116"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3344"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="454"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="459"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="524"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="552"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="566"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="569"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="584"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="592"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3088"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="593"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3168"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="false">
-      <terms:term id="178"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3168"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="false">
-      <terms:term id="462"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3168"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="false">
-      <terms:term id="514"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3168"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="false">
-      <terms:term id="515"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="596"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="597"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="596"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="631"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="596"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="856"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="596"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="860"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="107"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1302"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1527"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="182"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="184"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="201"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3013"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3101"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="false" isPreferred="true">
-      <terms:term id="3118"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3330"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3332"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="93"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="95"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="946"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1627"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="946"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="2639"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="946"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3424"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="946"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3426"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="946"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3430"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="946"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3438"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="946"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="952"/>
-    </terms:destination>
-  </terms:orderedPair>
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="946"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="960"/>
-    </terms:destination>
-  </terms:orderedPair>
-</terms:hierarchy>
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
deleted file mode 100644
index b983bd2d7..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<terms:mapping xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
-    <terms:source>
-        <terms:domain resource="http://www.esd.org.uk/standards/lgcl/1.03/termslist.xml"/>
-    </terms:source>
-    <terms:destination>
-        <terms:domain resource="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml"/>
-    </terms:destination>
-
-  <terms:orderedPair>
-      <terms:source><terms:term id="1"/></terms:source>
-      <terms:destination><terms:term id="1"/></terms:destination>
-  </terms:orderedPair>
-  
-  <terms:orderedPair>
-      <terms:source><terms:term id="1007"/></terms:source>
-      <terms:destination><terms:term id="1007"/></terms:destination>
-  </terms:orderedPair>
-  
-  <terms:orderedPair><terms:source><terms:term id="1021"/></terms:source><terms:destination><terms:term id="1021"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1039"/></terms:source><terms:destination><terms:term id="1039"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1286"/></terms:source><terms:destination><terms:term id="1286"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1325"/></terms:source><terms:destination><terms:term id="1325"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1337"/></terms:source><terms:destination><terms:term id="1337"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="204"/></terms:source><terms:destination><terms:term id="204"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="281"/></terms:source><terms:destination><terms:term id="281"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3088"/></terms:source><terms:destination><terms:term id="3088"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3168"/></terms:source><terms:destination><terms:term id="3168"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="596"/></terms:source><terms:destination><terms:term id="596"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="93"/></terms:source><terms:destination><terms:term id="93"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="946"/></terms:source><terms:destination><terms:term id="946"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="11"/></terms:source><terms:destination><terms:term id="11"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="15"/></terms:source><terms:destination><terms:term id="15"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1523"/></terms:source><terms:destination><terms:term id="1523"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="21"/></terms:source><terms:destination><terms:term id="21"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3100"/></terms:source><terms:destination><terms:term id="3100"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3300"/></terms:source><terms:destination><terms:term id="3300"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3323"/></terms:source><terms:destination><terms:term id="3323"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3329"/></terms:source><terms:destination><terms:term id="3329"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="5"/></terms:source><terms:destination><terms:term id="5"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="59"/></terms:source><terms:destination><terms:term id="59"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="62"/></terms:source><terms:destination><terms:term id="62"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="66"/></terms:source><terms:destination><terms:term id="66"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="70"/></terms:source><terms:destination><terms:term id="70"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="8"/></terms:source><terms:destination><terms:term id="8"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1008"/></terms:source><terms:destination><terms:term id="1008"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1017"/></terms:source><terms:destination><terms:term id="1017"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1026"/></terms:source><terms:destination><terms:term id="1026"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1029"/></terms:source><terms:destination><terms:term id="1029"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1037"/></terms:source><terms:destination><terms:term id="1037"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1308"/></terms:source><terms:destination><terms:term id="1308"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1309"/></terms:source><terms:destination><terms:term id="1309"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1326"/></terms:source><terms:destination><terms:term id="1326"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="2083"/></terms:source><terms:destination><terms:term id="2083"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3025"/></terms:source><terms:destination><terms:term id="3025"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3441"/></terms:source><terms:destination><terms:term id="3441"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3442"/></terms:source><terms:destination><terms:term id="3442"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1041"/></terms:source><terms:destination><terms:term id="1041"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1098"/></terms:source><terms:destination><terms:term id="1098"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1102"/></terms:source><terms:destination><terms:term id="1102"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1106"/></terms:source><terms:destination><terms:term id="1106"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1113"/></terms:source><terms:destination><terms:term id="1113"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1132"/></terms:source><terms:destination><terms:term id="1132"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1164"/></terms:source><terms:destination><terms:term id="1164"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1165"/></terms:source><terms:destination><terms:term id="1165"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1248"/></terms:source><terms:destination><terms:term id="1248"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1258"/></terms:source><terms:destination><terms:term id="1258"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1261"/></terms:source><terms:destination><terms:term id="1261"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1482"/></terms:source><terms:destination><terms:term id="1482"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1287"/></terms:source><terms:destination><terms:term id="1287"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1298"/></terms:source><terms:destination><terms:term id="1298"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1299"/></terms:source><terms:destination><terms:term id="1299"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1310"/></terms:source><terms:destination><terms:term id="1310"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1311"/></terms:source><terms:destination><terms:term id="1311"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3454"/></terms:source><terms:destination><terms:term id="3454"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1326"/></terms:source><terms:destination><terms:term id="1326"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1327"/></terms:source><terms:destination><terms:term id="1327"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1328"/></terms:source><terms:destination><terms:term id="1328"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1329"/></terms:source><terms:destination><terms:term id="1329"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1331"/></terms:source><terms:destination><terms:term id="1331"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1332"/></terms:source><terms:destination><terms:term id="1332"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1333"/></terms:source><terms:destination><terms:term id="1333"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1335"/></terms:source><terms:destination><terms:term id="1335"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1336"/></terms:source><terms:destination><terms:term id="1336"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="697"/></terms:source><terms:destination><terms:term id="697"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1352"/></terms:source><terms:destination><terms:term id="1352"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1353"/></terms:source><terms:destination><terms:term id="1353"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1388"/></terms:source><terms:destination><terms:term id="1388"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1402"/></terms:source><terms:destination><terms:term id="1402"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1424"/></terms:source><terms:destination><terms:term id="1424"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3457"/></terms:source><terms:destination><terms:term id="3457"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3459"/></terms:source><terms:destination><terms:term id="3459"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3461"/></terms:source><terms:destination><terms:term id="3461"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="205"/></terms:source><terms:destination><terms:term id="205"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="206"/></terms:source><terms:destination><terms:term id="206"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="212"/></terms:source><terms:destination><terms:term id="212"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="219"/></terms:source><terms:destination><terms:term id="219"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="2237"/></terms:source><terms:destination><terms:term id="2237"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="238"/></terms:source><terms:destination><terms:term id="238"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="280"/></terms:source><terms:destination><terms:term id="280"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3008"/></terms:source><terms:destination><terms:term id="3008"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3345"/></terms:source><terms:destination><terms:term id="3345"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3346"/></terms:source><terms:destination><terms:term id="3346"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3347"/></terms:source><terms:destination><terms:term id="3347"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3359"/></terms:source><terms:destination><terms:term id="3359"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3366"/></terms:source><terms:destination><terms:term id="3366"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3440"/></terms:source><terms:destination><terms:term id="3440"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="284"/></terms:source><terms:destination><terms:term id="284"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3374"/></terms:source><terms:destination><terms:term id="3374"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3379"/></terms:source><terms:destination><terms:term id="3379"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3391"/></terms:source><terms:destination><terms:term id="3391"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3393"/></terms:source><terms:destination><terms:term id="3393"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3400"/></terms:source><terms:destination><terms:term id="3400"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="347"/></terms:source><terms:destination><terms:term id="347"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="372"/></terms:source><terms:destination><terms:term id="372"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="409"/></terms:source><terms:destination><terms:term id="409"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="420"/></terms:source><terms:destination><terms:term id="420"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="451"/></terms:source><terms:destination><terms:term id="451"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="13"/></terms:source><terms:destination><terms:term id="13"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3116"/></terms:source><terms:destination><terms:term id="3116"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3344"/></terms:source><terms:destination><terms:term id="3344"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="454"/></terms:source><terms:destination><terms:term id="454"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="459"/></terms:source><terms:destination><terms:term id="459"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="524"/></terms:source><terms:destination><terms:term id="524"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="552"/></terms:source><terms:destination><terms:term id="552"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="566"/></terms:source><terms:destination><terms:term id="566"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="569"/></terms:source><terms:destination><terms:term id="569"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="584"/></terms:source><terms:destination><terms:term id="584"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="592"/></terms:source><terms:destination><terms:term id="592"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="593"/></terms:source><terms:destination><terms:term id="593"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="178"/></terms:source><terms:destination><terms:term id="178"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="462"/></terms:source><terms:destination><terms:term id="462"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="514"/></terms:source><terms:destination><terms:term id="514"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="515"/></terms:source><terms:destination><terms:term id="515"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="597"/></terms:source><terms:destination><terms:term id="597"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="631"/></terms:source><terms:destination><terms:term id="631"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="856"/></terms:source><terms:destination><terms:term id="856"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="860"/></terms:source><terms:destination><terms:term id="860"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="107"/></terms:source><terms:destination><terms:term id="107"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1302"/></terms:source><terms:destination><terms:term id="1302"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1527"/></terms:source><terms:destination><terms:term id="1527"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="182"/></terms:source><terms:destination><terms:term id="182"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="184"/></terms:source><terms:destination><terms:term id="184"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="201"/></terms:source><terms:destination><terms:term id="201"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3013"/></terms:source><terms:destination><terms:term id="3013"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3101"/></terms:source><terms:destination><terms:term id="3101"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3118"/></terms:source><terms:destination><terms:term id="3118"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3330"/></terms:source><terms:destination><terms:term id="3330"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3332"/></terms:source><terms:destination><terms:term id="3332"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="95"/></terms:source><terms:destination><terms:term id="95"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="1627"/></terms:source><terms:destination><terms:term id="1627"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="2639"/></terms:source><terms:destination><terms:term id="2639"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3424"/></terms:source><terms:destination><terms:term id="3424"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3426"/></terms:source><terms:destination><terms:term id="3426"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3430"/></terms:source><terms:destination><terms:term id="3430"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="3438"/></terms:source><terms:destination><terms:term id="3438"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="952"/></terms:source><terms:destination><terms:term id="952"/></terms:destination></terms:orderedPair>
-  <terms:orderedPair><terms:source><terms:term id="960"/></terms:source><terms:destination><terms:term id="960"/></terms:destination></terms:orderedPair>
-</terms:mapping>
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
deleted file mode 100644
index 34b25d21e..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/categories/xample-nav-mapping-lgcl-anav.xsl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
-
-  <xsl:template match="terms:domain">
-
-    <terms:mapping xmlns:terms="http://xmlns.redhat.com/london/terms/1.0">
-      <terms:source>
-        <terms:domain resource="http://www.esd.org.uk/standards/lgcl/1.03/termslist.xml"/>
-      </terms:source>
-      <terms:destination>
-        <terms:domain resource="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml"/>
-      </terms:destination>
-      
-      <xsl:apply-templates />
-    
-    </terms:mapping>
-
-  </xsl:template>
-
-  <xsl:template match="terms:term">
-    
-    <terms:orderedPair>
-      <terms:source>
-        <terms:term>
-          <xsl:attribute name="id">
-            <xsl:value-of select="@id" />
-          </xsl:attribute> 
-        </terms:term>
-      </terms:source>
-      <terms:destination>
-        <terms:term>
-          <xsl:attribute name="id">
-            <xsl:value-of select="@id" />
-          </xsl:attribute> 
-        </terms:term>
-      </terms:destination>
-    </terms:orderedPair>
-
-  </xsl:template>
-  
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/navigation/sci-templates.txt
deleted file mode 100755
index 65c187b5d..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/res/bundle/navigation/sci-templates.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/sci-default.jsp
-ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/sci-recent.jsp
-ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/sci-atoz.jsp
-ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/sci-events.jsp
-ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/sci-portal.jsp
-ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
-ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/sci-welcome.jsp
-ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp
-ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/SciPublicationList.jsp
-Institute Project List,institute project list,/templates/ccm-navigation/navigation/institute-projectlist.jsp
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/res/placeholder.info b/ccm-sci-bundle/bundles/local/jensp-dev/res/placeholder.info
deleted file mode 100644
index 5ae76207c..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/res/placeholder.info
+++ /dev/null
@@ -1,3 +0,0 @@
-Subdirectory  <cat> may optionally contain one or more local site specific 
-import xml files for Terms domain categories. 
-
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/templates/placeholder.info b/ccm-sci-bundle/bundles/local/jensp-dev/templates/placeholder.info
deleted file mode 100644
index c78cf06e6..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/templates/placeholder.info
+++ /dev/null
@@ -1,12 +0,0 @@
-Subdirectory  <nav> may optionally contain navigation item templates for
-navigation index pages which either overwrite or ammend those templates
-which are default for ccm-sci-bundle and stored in 
-   /web/templates/ccm-navigation/navigation
-
-Templates of the same name in this subdirectory just overwrite the
-default files. Templates of different names are stored in addition
-to the default template files. In the later case a developer must
-provide a customised template.txt file replacing the default file
-   /src/WEB-INF/navigation/sci-templates.txt
-This file must be specified in parameter 
-   com.arsdigita.navigation.templates_file
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/themes/README b/ccm-sci-bundle/bundles/local/jensp-dev/themes/README
deleted file mode 100644
index 13248d9bb..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/themes/README
+++ /dev/null
@@ -1,13 +0,0 @@
-Bundle subdir themes
-
-Purpose:
-This subdir may optionally contain theme files which either replace part of the
-theme or add files to the theme provided as default for ScientificCMS and this
-way adopt the theme for site specific design. 
-
-All files and subdirectories all copied asis to the applications ~/themes 
-directory in its document (context) root.
-
-It is the responsibility of developer / system integrator to ensure all files
-are copied to the right location and the theme works with the modification. No
-functionality or consistency check is perfordmed!
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/themes/master/dummy b/ccm-sci-bundle/bundles/local/jensp-dev/themes/master/dummy
deleted file mode 100644
index beec54a4d..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/themes/master/dummy
+++ /dev/null
@@ -1 +0,0 @@
-Just a dummy file for test purpose during development.
\ No newline at end of file
diff --git a/ccm-sci-bundle/bundles/local/jensp-dev/themes/placeholder.info b/ccm-sci-bundle/bundles/local/jensp-dev/themes/placeholder.info
deleted file mode 100644
index 38db9a8ae..000000000
--- a/ccm-sci-bundle/bundles/local/jensp-dev/themes/placeholder.info
+++ /dev/null
@@ -1,12 +0,0 @@
-Subdirectory  <nav> may optionally contain navigation item templates for
-navigation index pages which either overwrite or ammend those templates
-which are default for ccm-sci-bundle and stored in 
-   /web/templates/ccm-navigation/navigation
-
-Templates of the same name in this subdirectory just overwrite the
-default files. Templates of different names are stored in addition
-to the default template files. In the later case a developer must
-provide a customised template.txt file replacing the default file
-   /src/WEB-INF/navigation/sci-templates.txt
-This file must be specified in parameter 
-   com.arsdigita.london.navigation.templates_file
\ No newline at end of file