--- a/symbian3/mw/metadatasrv/package_definition.xml	Mon Nov 01 14:43:51 2010 +0000
+++ b/symbian3/mw/metadatasrv/package_definition.xml	Thu Nov 04 13:35:31 2010 +0000
@@ -2,45 +2,16 @@
 <SystemDefinition schema="3.0.0">
  <package id="metadatasrv" name="Legacy Metadata Services" levels="plugin framework server generic specific">
   <collection id="metadatasrv_pub" name="Legacy Metadata Services Public Interfaces" level="specific">
-   <component id="content_listing_framework_api" name="Content Listing Framework API" class="api" filter="s60">
-    <meta rel="config">
-     <not-defined condition="RD_MDS_2_5"/>
-    </meta>
-    <!-- Leave commented out until confguration is in use
-	unit bldFile="metadatasrv_pub/content_listing_framework_api/group"/>-->
-   </component>
    <component id="media_fetch_api" name="Media Fetch API" class="api" filter="s60">
     <meta rel="Api" href="metadatasrv_pub/media_fetch_api/media_fetch_api.metaxml"/>
     <unit bldFile="metadatasrv_pub/media_fetch_api/group"/>
    </component>
-   <component id="metadatasrv_pub_build" name="Legacy Metadata Services Public Interface Build" class="api" filter="s60">
-	<!-- only needed for #ifdefs, remove when confguration is in use -->
-    <unit bldFile="metadatasrv_pub/group"/>
-   </component>
   </collection>
   <collection id="metadatasrv_plat" name="Legacy Metadata Services Platform Interfaces" level="specific">
    <component id="media_fetch_implementation_api" name="Media Fetch Implementation API" class="api" filter="s60">
     <meta rel="Api" href="metadatasrv_plat/media_fetch_implementation_api/media_fetch_implementation_api.metaxml"/>
     <unit bldFile="metadatasrv_plat/media_fetch_implementation_api/group"/>
    </component>
-   <component id="content_listing_framework_collection_manager_api" name="Content Listing Framework Collection Manager API" class="api" filter="s60">
-    <meta rel="config">
-     <not-defined condition="RD_MDS_2_5"/>
-    </meta>
-    <!-- Leave commented out until confguration is in use
-    <unit bldFile="metadatasrv_plat/content_listing_framework_collection_manager_api/group"/>-->
-   </component>
-   <component id="content_listing_framework_extended_api" name="Content Listing Framework Extended API" class="api" filter="s60">
-    <meta rel="config">
-     <not-defined condition="RD_MDS_2_5"/>
-    </meta>
-    <!-- Leave commented out until confguration is in use
-    <unit bldFile="metadatasrv_plat/content_listing_framework_extended_api/group"/>-->
-   </component>
-   <component id="metadatasrv_plat_build" name="Legacy Metadata Services Platform Interface Build" class="api" filter="s60">
-	<!-- only needed for #ifdefs, remove when confguration is in use -->
-    <unit bldFile="metadatasrv_plat/group"/>
-   </component>
   </collection>
   <collection id="mediamanagementutilities" name="Media Management Utilities" level="generic">
    <component id="mediafetch" filter="s60" name="Media Fetch">