# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1253279862 -3600
# Node ID 5d0c6863d784be4c0ba27ef090bd6fff5b784ffd
# Parent  923a33cb34ba66f4d75cef1dde24608c517db327# Parent  0a27dd5fe042f665787072f78a9df3241e6ff0a5
catchup merge

diff -r 923a33cb34ba -r 5d0c6863d784 symbian3/single/job_props.ant.xml
--- a/symbian3/single/job_props.ant.xml	Fri Sep 18 14:16:33 2009 +0100
+++ b/symbian3/single/job_props.ant.xml	Fri Sep 18 14:17:42 2009 +0100
@@ -35,7 +35,7 @@
     <property name="sf.spec.baseline.enable"         value="true"/>     
     <property name="sf.spec.baseline.clean"          value="false"/>
     <property name="sf.spec.baseline.select"         value="location" />
-    <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\PDK_candidate_2.0.d_flat\" />
+    <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\PDK_3.0.a_tools_baseline" />
     
     <property name="sf.spec.toolsbaseline.enable"    value="true"/>
     <property name="sf.spec.toolsbaseline.getenv_options" value="-i emu"/>
@@ -44,7 +44,7 @@
     
     <!-- platform build specific properties -->
     <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_1_sf" />
-    <property name="sf.spec.os.sysdef.clean.configurations.list"   value="GT_tb91sf" />
+    <property name="sf.spec.os.sysdef.clean.configurations.list"   value="GT_tb92sf" />
     
     <!-- provide dtd location as os and s60 layers will be different -->
     <property name="sf.spec.s60.sysdef.dtd"  value="${sf.spec.job.dir}\sysdefs\sysdef_dtd_1_4_0.xml"/>
diff -r 923a33cb34ba -r 5d0c6863d784 symbian3/split/job_props.ant.xml
--- a/symbian3/split/job_props.ant.xml	Fri Sep 18 14:16:33 2009 +0100
+++ b/symbian3/split/job_props.ant.xml	Fri Sep 18 14:17:42 2009 +0100
@@ -33,7 +33,7 @@
     <property name="sf.spec.baseline.enable"         value="true"/>     
     <property name="sf.spec.baseline.clean"          value="false"/>
     <property name="sf.spec.baseline.select"         value="location" />
-    <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\PDK_candidate_2.0.d_flat\" />
+    <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\PDK_3.0.a_tools_baseline" />
     
     <property name="sf.spec.toolsbaseline.enable"    value="true"/>
     <property name="sf.spec.toolsbaseline.getenv_options" value="-i emu"/>
@@ -42,7 +42,7 @@
     
     <!-- platform build specific properties -->
     <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_1_sf" />
-    <property name="sf.spec.os.sysdef.clean.configurations.list"   value="GT_tb91sf" />
+    <property name="sf.spec.os.sysdef.clean.configurations.list"   value="GT_tb92sf" />
     
     <!-- provide dtd location as os and s60 layers will be different -->
     <property name="sf.spec.s60.sysdef.dtd"  value="${sf.spec.job.dir}\sysdefs\sysdef_dtd_1_4_0.xml"/>
diff -r 923a33cb34ba -r 5d0c6863d784 symbian3/split/sources_fcl.csv
--- a/symbian3/split/sources_fcl.csv	Fri Sep 18 14:16:33 2009 +0100
+++ b/symbian3/split/sources_fcl.csv	Fri Sep 18 14:17:42 2009 +0100
@@ -7,9 +7,9 @@
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/contacts/,/sf/app/contacts,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/conversations/,/sf/app/conversations,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/dictionary/,/sf/app/dictionary,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/files/,/sf/app/files,branch,default,layers.sysdef.xml
@@ -27,8 +27,8 @@
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/musicplayer/,/sf/app/musicplayer,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/organizer/,/sf/app/organizer,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/phone/,/sf/app/phone,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/poc/,/sf/app/poc,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/profile/,/sf/app/profile,branch,default,layers.sysdef.xml
@@ -46,12 +46,15 @@
 //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/gsprofilesrv,/sf/mw/gsprofilesrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/helix/,/sf/mw/helix,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,default,layers.sysdef.xml
@@ -78,9 +81,10 @@
 //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/svgt/,/sf/mw/svgt,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/uiresources/,/sf/mw/uiresources,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/uitools/,/sf/mw/uitools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/videoutils/,/sf/mw/videoutils,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,branch,default,layers.sysdef.xml
@@ -88,30 +92,32 @@
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/bt/,/sf/os/bt,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/ossrv/,/sf/os/ossrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/persistentdata/,/sf/os/persistentdata,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/os/security/,/sf/os/security,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/textandloc/,/sf/os/textandloc,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/usb/,/sf/os/usb,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
 //v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,
-//v800008/Builds01/mercurial_master_stage/sfl/FCL/sf/tools/platformtools/,/sf/tools/platformtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/rndtools/,/sf/tools/rndtools,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/app/rndtools/,/sf/app/rndtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_stage/sfl/MCL/sf/tools/swconfigtools/,/sf/tools/swconfigtools,branch,default,layers.sysdef.xml
\ No newline at end of file
diff -r 923a33cb34ba -r 5d0c6863d784 symbian3/split/sysdefs/system_model_os.xml
--- a/symbian3/split/sysdefs/system_model_os.xml	Fri Sep 18 14:16:33 2009 +0100
+++ b/symbian3/split/sysdefs/system_model_os.xml	Fri Sep 18 14:17:42 2009 +0100
@@ -108,20 +108,6 @@
 <unit mrp="os\kernelhwsrv\brdbootldr\ubootldr\base_ubootldr.mrp"/>
 </component>
 </collection>
-<collection name="n:unistore2" long-name="UniStore2 Flash Translation Layer" level="hw-if">
-<component name="n:uiidrivers" long-name="UniStore2 Drivers" filter="gt" introduced="9.1" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\unistore2" mrp="os\kernelhwsrv\kernel\eka\drivers\unistore2\base_drivers_unistore2.mrp"/>
-</component>
-<component name="n:uiicore" long-name="UniStore2 Core" filter="gt" introduced="9.1" purpose="optional">
-<unit mrp="os\kernelhwsrv\kernel\eka\drivers\unistore2\base_drivers_unistore2_undeliverable.mrp"/>
-</component>
-<component name="n:uiicrashlogger" long-name="UniStore2 Crash Logger" filter="gt" introduced="9.1" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\crashflash\unistore2" mrp="os\kernelhwsrv\kernel\eka\drivers\crashflash\unistore2\base_crashflash_unistore2.mrp"/>
-</component>
-<component name="n:uiibootsupport" long-name="UniStore2 Boot Support" filter="gt" introduced="9.1" purpose="optional">
-<unit bldFile="os\kernelhwsrv\unistore2\uiibootsupport" mrp="os\kernelhwsrv\unistore2\uiibootsupport\base_nandboot_unistore2.mrp"/>
-</component>
-</collection>
 <collection name="bsptemplate" long-name="BSP Template" level="hw-if">
 <component name="asspandvariant" long-name="Template ASSP and Variant" introduced="6.0" purpose="development">
 <unit bldFile="os\kernelhwsrv\bsptemplate\asspandvariant\template_variant" mrp="os\kernelhwsrv\bsptemplate\asspandvariant\base_template.mrp"/>
@@ -133,18 +119,12 @@
 </component>
 </collection>
 <collection name="kerneltest" long-name="Kernel Test" level="hw-if">
-<component name="n:sdiotest" long-name="SDIO Tests" filter="gt" introduced="9.2" purpose="development">
-<unit bldFile="os\kernelhwsrv\kerneltest\sdiotest" mrp="os\kernelhwsrv\kerneltest\sdiotest\base_sdiotests.mrp"/>
-</component>
 <component name="e32utils" long-name="E32 Utilities" purpose="development">
 <unit bldFile="os\kernelhwsrv\kerneltest\e32utils\group" mrp="os\kernelhwsrv\kerneltest\e32utils\group\base_e32utils.mrp"/>
 </component>
 <component name="e32test" long-name="E32 Tests" purpose="development">
 <unit bldFile="os\kernelhwsrv\kerneltest\e32test\group" mrp="os\kernelhwsrv\kerneltest\e32test\group\base_e32test.mrp"/>
 </component>
-<component name="n:e32utils_restricted" long-name="Restricted E32 Utilities" purpose="development">
-<unit bldFile="os\kernelhwsrv\kerneltest\e32utils\group\restricted" mrp="os\kernelhwsrv\kerneltest\e32utils\group\restricted\base_e32utils_restricted.mrp"/>
-</component>
 <component name="f32test" long-name="File Server Tests" purpose="development">
 <unit bldFile="os\kernelhwsrv\kerneltest\f32test\group" mrp="os\kernelhwsrv\kerneltest\f32test\group\base_f32test.mrp"/>
 </component>
@@ -177,12 +157,6 @@
 </component>
 </collection>
 <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
-<component name="n:sdcard3c" long-name="SD Card 3C Driver" filter="gt" introduced="9.1" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\medsd3c" mrp="os\kernelhwsrv\kernel\eka\drivers\medsd3c\base_e32_sd3c.mrp"/>
-</component>
-<component name="n:sdcard4c" long-name="SD Card 4C Driver" filter="gt" introduced="9.1" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c" mrp="os\kernelhwsrv\kernel\eka\drivers\pbus\mmc\sdcard\sdcard4c\base_e32_sd4c.mrp"/>
-</component>
 <component name="mediadrivers" long-name="Media Drivers" purpose="optional">
 <!-- these are for storage media-->
 <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\media" mrp="os\kernelhwsrv\kernel\eka\drivers\media\base_e32_drivers_media.mrp"/>
@@ -207,9 +181,6 @@
 <component name="domainmgr" long-name="Domain Manager" introduced="8.1b" purpose="mandatory">
 <unit bldFile="os\kernelhwsrv\userlibandfileserver\domainmgr\group" mrp="os\kernelhwsrv\userlibandfileserver\domainmgr\group\base_domain.mrp"/>
 </component>
-<component name="n:basedocs" long-name="Base Documentation" purpose="development" class="doc">
-<unit mrp="os\kernelhwsrv\userlibandfileserver\basedocs\base_documentation.mrp"/>
-</component>
 </collection>
 <collection name="filesystems" long-name="File Systems" level="framework">
 <component name="romfs" long-name="ROM File System" filter="gt" purpose="optional" plugin="Y">
@@ -233,15 +204,6 @@
 <component name="compfs" long-name="Composite File System" filter="gt" purpose="optional" plugin="Y">
 <unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\scomp" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\scomp\base_f32_scomp.mrp"/>
 </component>
-<component name="n:ntfs" long-name="NTFS" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\ntfs" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\ntfs\base_f32_sntfs.mrp"/>
-</component>
-<component name="n:iso9660fs" long-name="ISO9660 File System" filter="gt" introduced="8.1b" purpose="optional" plugin="Y">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\iso9660" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\iso9660\base_f32_siso9660.mrp"/>
-</component>
-<component name="n:exfatfs" long-name="exFAT File System" filter="gt" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\kernelhwsrv\userlibandfileserver\fileserver\internal\exfat" mrp="os\kernelhwsrv\userlibandfileserver\fileserver\internal\exfat\base_f32_exfat.mrp"/>
-</component>
 </collection>
 <collection name="halservices" long-name="HAL Services" level="framework">
 <component name="hal" long-name="User-Side Hardware Abstraction" introduced="6.0" purpose="optional">
@@ -265,9 +227,6 @@
 <component name="kernelhwsrv_metadata" long-name="Kernel and Hardware Services Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\kernelhwsrv\kernelhwsrv_info\kernelhwsrv_metadata\kernelhwsrv_metadata.mrp"/>
 </component>
-<component name="n:nokia_kernelhwsrv_metadata" long-name="Nokia Kernel and Hardware Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\kernelhwsrv\kernelhwsrv_info\nokia_kernelhwsrv_metadata\nokia_kernelhwsrv_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="boardsupport" level="hw" long-name="Board Support" levels="bsp test 2 3 config">
@@ -275,78 +234,6 @@
 <component name="emulatorbsp" long-name="Emulator BSP" purpose="optional">
 <unit bldFile="os\boardsupport\emulator\emulatorbsp" mrp="os\boardsupport\emulator\emulatorbsp\base_wins.mrp"/>
 </component>
-<component name="n:unistore2emulatorsupport" long-name="UniStore2 Emulator Support" filter="gt" introduced="tb91" purpose="optional">
-<unit bldFile="os\boardsupport\emulator\unistore2emulatorsupport" mrp="os\boardsupport\emulator\unistore2emulatorsupport\base_wins_unistore2.mrp"/>
-</component>
-</collection>
-<collection name="n:omaph4" long-name="OMAP H4" level="bsp">
-<component name="n:omapusbhotgdrivers" long-name="OMAP USB Host and OTG Controller Drivers" introduced="tb92" filter="gt" purpose="optional">
-<unit bldFile="os\boardsupport\omaph4\omapusbhotgdrivers" mrp="os\boardsupport\omaph4\omapusbhotgdrivers\base_omaph4hrp_usbhostotg_usbware.mrp"/>
-</component>
-<component name="n:omaph4bsp" long-name="OMAP H4 BSP" purpose="optional">
-<unit bldFile="os\boardsupport\omaph4\omaph4bsp\h4" mrp="os\boardsupport\omaph4\omaph4bsp\h4\base_omaph4hrp.mrp"/>
-</component>
-<component name="n:h4bootloader" long-name="H4 Boot Loader" introduced="9.1" purpose="optional">
-<unit mrp="os\boardsupport\omaph4\h4bootloader\base_omaph4hrp_bootldr.mrp" bldFile="os\boardsupport\omaph4\h4bootloader"/>
-</component>
-<component name="n:omaph4flexible" long-name="OMAP H4 Flexible" introduced="tb92" purpose="optional">
-<unit bldFile="os\boardsupport\omaph4\omaph4bsp\h4\flexible" mrp="os\boardsupport\omaph4\omaph4bsp\h4\flexible\base_omaph4hrp_flexible.mrp"/>
-</component>
-<component name="n:omaph4minienvbootloader" long-name="OMAP H4 Mini Environment Boot Loader" introduced="9.2" purpose="optional">
-<unit mrp="os\boardsupport\omaph4\omaph4minienvbootloader\base_omaph4hrp_mebootldr.mrp" bldFile="os\boardsupport\omaph4\omaph4minienvbootloader"/>
-</component>
-<component name="n:omaph4unistore2" long-name="OMAP H4 Unistore2" filter="gt" introduced="9.2" purpose="optional">
-<unit bldFile="os\boardsupport\omaph4\omaph4unistore2" mrp="os\boardsupport\omaph4\omaph4unistore2\base_omaph4hrp_unistore2.mrp"/>
-</component>
-<component name="n:omaph4sdio" long-name="OMAP H4 SDIO" filter="gt" introduced="9.2" purpose="optional">
-<unit bldFile="os\boardsupport\omaph4\omaph4sdio" mrp="os\boardsupport\omaph4\omaph4sdio\base_omaph4hrp_sdio.mrp"/>
-</component>
-</collection>
-<collection name="n:omap3variants" long-name="OMAP3 Variants" level="bsp">
-<component name="n:tiomap3bsp" long-name="TI OMAP3 BSP" introduced="Future" purpose="optional">
-<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp" mrp="os\boardsupport\omap3variants\tiomap3bsp\base_tiomap3.mrp"/>
-</component>
-<component name="n:tiomap3unistore2" long-name="TI OMAP3 UniStore2" filter="gt" introduced="Future" purpose="optional">
-<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp_restricted\unistore2" mrp="os\boardsupport\omap3variants\tiomap3bsp\base_tiomap3_unistore2.mrp"/>
-</component>
-<component name="n:omap3h6flexible" long-name="OMAP3 H6 Flexible" introduced="tb92" purpose="optional">
-<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp\flexible" mrp="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp\flexible\base_tiomap3_flexible.mrp"/>
-</component>
-<component name="n:omap3h6uiiflexible" long-name="OMAP3 H6 UniStore2 Flexible" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp_restricted\unistore2\flexible" mrp="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp_restricted\unistore2\flexible\base_tiomap3_unistore2_flexible.mrp"/>
-</component>
-<component name="n:tiomap3h6sdio" long-name="TI OMAP3 H6 SDIO" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp_restricted\sdio" mrp="os\boardsupport\omap3variants\tiomap3bsp\variant\34xx_sdp_restricted\sdio\base_tiomap3_sdio.mrp"/>
-</component>
-<component name="n:tiomap3labbsp" long-name="TI OMAP3 LAB Baseport" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\lab" mrp="os\boardsupport\omap3variants\tiomap3bsp\variant\lab\base_tiomap3_lab.mrp"/>
-</component>
-<component name="n:tiomap3labsdio" long-name="TI OMAP3 LAB SDIO" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\lab_restricted\sdio" mrp="os\boardsupport\omap3variants\tiomap3bsp\variant\lab_restricted\sdio\base_tiomap3_lab_sdio.mrp"/>
-</component>
-<component name="n:tiomap3labuii" long-name="TI OMAP3 LAB UniStore2" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="os\boardsupport\omap3variants\tiomap3bsp\variant\lab_restricted\unistore2" mrp="os\boardsupport\omap3variants\tiomap3bsp\variant\lab_restricted\unistore2\base_tiomap3_lab_unistore2.mrp"/>
-</component>
-</collection>
-<collection name="n:naviengine" long-name="NaviEngine Baseport" level="bsp">
-<component name="n:naviengineusbhcd" long-name="NaviEngine USB Host Controller Driver" introduced="tb92" filter="gt" purpose="optional">
-<unit bldFile="os\boardsupport\naviengine\naviengineusbhcd" mrp="os\boardsupport\naviengine\naviengineusbhcd\base_naviengine_usbhost.mrp"/>
-</component>
-<component name="n:navienginebsp" long-name="NaviEngine BSP" introduced="tb92" filter="gt" purpose="optional">
-<unit bldFile="os\boardsupport\naviengine\navienginebsp\ne1_tb" mrp="os\boardsupport\naviengine\navienginebsp\base_naviengine.mrp" version="Built"/>
-</component>
-<component name="n:navienginebspflexible" long-name="NaviEngine BSP flexible" introduced="tb92" filter="gt" purpose="optional">
-<unit bldFile="os\boardsupport\naviengine\navienginebspflexible" mrp="os\boardsupport\naviengine\navienginebspflexible\base_naviengine_flexible.mrp" version="Built"/>
-</component>
-<component name="n:navienginebootldr" long-name="NaviEngine Boot Loader" introduced="tb92" filter="gt" purpose="optional">
-<unit bldFile="os\boardsupport\naviengine\navienginebootldr" mrp="os\boardsupport\naviengine\navienginebootldr\base_ne1_tb_bootldr.mrp" version="Built"/>
-</component>
-<component name="n:naviengineunistore2" long-name="NaviEngine UniStore2" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="os\boardsupport\naviengine\naviengineunistore2" mrp="os\boardsupport\naviengine\naviengineunistore2\base_nec_naviengine_unistore2.mrp" version="Built"/>
-</component>
-<component name="n:naviengineunistore2flex" long-name="NaviEngine UniStore2 Flexible" filter="gt" introduced="tb92" purpose="optional">
-<unit bldFile="os\boardsupport\naviengine\naviengineunistore2flex" mrp="os\boardsupport\naviengine\naviengineunistore2flex\base_nec_naviengine_unistore2_flexible.mrp" version="Built"/>
-</component>
 </collection>
 <collection name="haitest" long-name="HAI Test Suites" level="test">
 <component name="bspsvs" long-name="BSP Verification Suite" introduced="tb91" purpose="development">
@@ -357,9 +244,6 @@
 <component name="boardsupport_metadata" long-name="Board Support Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\boardsupport\boardsupport_info\boardsupport_metadata\boardsupport_metadata.mrp"/>
 </component>
-<component name="n:nokia_boardsupport_metadata" long-name="Nokia Board Support Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\boardsupport\boardsupport_info\nokia_boardsupport_metadata\nokia_boardsupport_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="buildtools" level="hw" long-name="Build Tools" levels="bld mw fw ui">
@@ -386,352 +270,47 @@
 <component name="productionbldtools" long-name="Production Build Tools" filter="gt" purpose="development">
 <unit mrp="os\buildtools\toolsandutils\productionbldtools\product_tools.mrp"/>
 </component>
-<component name="n:ctsfunctionalitycheckers" long-name="CTS Functionality Checkers" purpose="development">
-<unit mrp="os\buildtools\toolsandutils\ctsfunctionalitycheckers\Group\testtools_cts_functionalitycheckers.mrp"/>
-</component>
-<component name="n:burtestserver" long-name="BUR Test Server" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\burtestserver\Group" mrp="os\buildtools\toolsandutils\burtestserver\Group\testtools_burtestserver.mrp"/>
-</component>
-<component name="n:cbrtools" long-name="Component Based Release (CBR) Tools" filter="gt" purpose="development">
-<!-- PLACEHOLDER="DS.1756" START REMOVE -->
-<unit bldFile="os\buildtools\toolsandutils\cbrtools\group" mrp="os\buildtools\toolsandutils\cbrtools\group\tools_cbr_tools.mrp"/>
-<!-- PLACEHOLDER="DS.1756" END REMOVE -->
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="depl_sdkcreationmdw_packaging_cbrtools"/>
-     -->
-</component>
-<component name="n:prf" long-name="Product Realisation Framework" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\prf\group" mrp="os\buildtools\toolsandutils\prf\group\tools_cbr_prf.mrp"/>
-</component>
-<component name="n:cdb" long-name="Code Database" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\cdb\group" mrp="os\buildtools\toolsandutils\cdb\group\testtools_cdb.mrp"/>
-</component>
 <component name="e32tools" long-name="E32 Tools" deprecated="tb91" purpose="development" class="PC">
 <unit bldFile="os\buildtools\toolsandutils\e32tools\group" mrp="os\buildtools\toolsandutils\e32tools\group\tools_e32tools.mrp"/>
 </component>
-<component name="n:kitcomparator" long-name="Kit Comparator" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\kitcomparator\group" mrp="os\buildtools\toolsandutils\kitcomparator\group\testtools_cts_kitcomparator.mrp"/>
-</component>
 <component name="wincredistribution" long-name="WinC Redistribution" purpose="development">
 <unit mrp="os\buildtools\dist_os\redistributionwinceka2\tools_redistribution_winc.mrp"/>
 </component>
 <component name="additionalredistribution" long-name="Additional Redistribution" purpose="development">
 <unit mrp="os\buildtools\perltoolsplat_os\redistribution\additional_tools.mrp"/>
 </component>
-<component name="n:testdriver" long-name="Test Driver" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\testdriver\Group" mrp="os\buildtools\toolsandutils\testdriver\Group\testtools_testdriver.mrp"/>
-</component>
 <component name="statapi" long-name="STAT API" filter="gt" purpose="development">
 <unit bldFile="os\buildtools\toolsandutils\statapi\source\statapi\console" mrp="os\buildtools\toolsandutils\statapi\group\testtools_stat_device_gt.mrp"/>
 </component>
-<component name="n:statsource" long-name="STAT Source" filter="gt" purpose="development">
-<unit mrp="os\buildtools\toolsandutils\statsource\group\testtools_stat_common_source.mrp"/>
-</component>
-<component name="n:statdesktop" long-name="STAT Desktop" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\statdesktop\group" mrp="os\buildtools\toolsandutils\statdesktop\group\testtools_stat_desktop.mrp"/>
-</component>
-<component name="n:systemmonitor" long-name="System Monitor" introduced="8.0" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\systemmonitor\group" mrp="os\buildtools\toolsandutils\systemmonitor\group\testtools_systemmonitor.mrp"/>
-</component>
-<component name="n:testtoolsdesktop" long-name="Test Tools Desktop" filter="gt" deprecated="tb91" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\testtoolsdesktop\group" mrp="os\buildtools\toolsandutils\testtoolsdesktop\group\testtools_desktop.mrp"/>
-</component>
 <component name="wintunnel" long-name="Wintunnel" purpose="development">
 <unit mrp="os\buildtools\toolsandutils\wintunnel\group\testtools_WinTunnel_srconly.mrp"/>
 </component>
-<component name="n:usecasecontroller" long-name="Use Case Controller" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\usecasecontroller\BuildScripts\group" mrp="os\buildtools\toolsandutils\usecasecontroller\BuildScripts\group\testtools_ucc.mrp"/>
-</component>
 <component name="autotest" long-name="Autotest" purpose="development">
 <unit bldFile="os\buildtools\toolsandutils\autotest\group" mrp="os\buildtools\toolsandutils\autotest\group\tools_autotest.mrp"/>
 </component>
-<component name="n:unzip-5.40" long-name="Unzip 5.40" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_hostenv_dist_unzip-5.40"/>
-     -->
-</component>
-<component name="n:zip-2.2" long-name="Zip 2.2" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_hostenv_dist_zip-2.2"/>
-     -->
-</component>
-<component name="n:zdelta-2.1" long-name="Zdelta 2.1" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_hostenv_dist_zdelta-2.1"/>
-     -->
-</component>
-<component name="n:testconfigfileparser" long-name="Test Config File Parser" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\testconfigfileparser\group" mrp="os\buildtools\toolsandutils\testconfigfileparser\group\tools_testconfigfileparser.mrp"/>
-</component>
-<component name="n:kitsetupapp" long-name="Kit Setup App" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\kitsetupapp\group" mrp="os\buildtools\toolsandutils\kitsetupapp\group\tools_devkits_kitsetupapp.mrp" priority="1020"/>
-</component>
-<component name="n:navigationpages" long-name="Navigation Pages" purpose="development">
-<unit mrp="os\buildtools\toolsandutils\navigationpages\tools_sdk_eng_NavigationPages.mrp"/>
-</component>
-<component name="n:productinstaller" long-name="Product Installer" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\toolsandutils\productinstaller\group" mrp="os\buildtools\toolsandutils\productinstaller\group\tools_custkits_productinstaller.mrp"/>
-</component>
-<component name="n:stlport" long-name="STL Port" purpose="development">
-<!-- PLACEHOLDER="DS.1756" START REMOVE -->
-<unit bldFile="os\buildtools\toolsandutils\stlport\group" mrp="os\buildtools\toolsandutils\stlport\group\tools_stlport.mrp"/>
-<!-- PLACEHOLDER="DS.1756" END REMOVE -->
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_hostenv_cpptoolsplat_stlport"/>
-     -->
-</component>
-<component name="n:elf2e32" long-name="ELF to e32 (Postlinker)" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_build_e32tools_elf2e32"/>
-     -->
-</component>
-<component name="n:tranasm" long-name="Translate ASM" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_build_srctools_tranasm"/>
-     -->
-</component>
-<component name="n:e32lib" long-name="E32 Image Library" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_build_e32tools_e32lib"/>
-     -->
-</component>
-</collection>
-<collection name="n:dist_os" long-name="Redistribution" level="mw">
-<component name="n:redistributionwinceka2" long-name="Redistribution WINC EKA2" purpose="development">
-<unit bldFile="os\buildtools\dist_os\redistributionwinceka2" mrp="os\buildtools\dist_os\redistributionwinceka2\tools_redistribution_cedar.mrp"/>
-</component>
-</collection>
-<collection name="n:bintools_os" long-name="Binary Tools" level="fw">
-<component name="n:rcomp" long-name="Resource Compiler" purpose="development">
-<unit prebuilt="dev_build_bintools_rcomp"/>
-</component>
-<component name="n:evalid" long-name="Evalid" purpose="development">
-<!-- PLACEHOLDER="DS.1756" START REMOVE -->
-<unit bldFile="os\buildtools\bintools_os\evalid" mrp="os\buildtools\bintools_os\evalid\tools_evalid.mrp"/>
-<!-- PLACEHOLDER="DS.1756" END REMOVE -->
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_build_bintools_evalid"/>
-     -->
-</component>
-<component name="n:elftools" long-name="ELF Tools" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_build_bintools_elftools"/>
-     -->
-</component>
-<component name="n:checklib" long-name="Checklib" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_build_bintools_checklib"/>
-     -->
-</component>
-</collection>
-<collection name="n:perltoolsplat_os" long-name="Perl Tools Platform" level="mw">
-<component name="n:redistribution" long-name="Redistribution" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\perltoolsplat_os\redistribution" mrp="os\buildtools\perltoolsplat_os\redistribution\tools_redistribution_common.mrp"/>
-</component>
-<component name="n:cpp-2.9-psion-98r2" long-name="CPP 2.9-psion-98r2" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_hostenv_cpptoolsplat_cpp-2.9-psion-98r2"/>
-     -->
-</component>
-<component name="n:mingw-gcc-3.4.5" long-name="MinGW GCC 3.4.5" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_hostenv_cpptoolsplat_mingw-gcc-3.4.5"/>
-     -->
-</component>
-<component name="n:gccxml-cdb" long-name="GCCXML (cdb)" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_hostenv_compilationtoolchains_gccxml-cdb"/>
-     -->
-</component>
-<component name="n:gcce-3.4.3" long-name="GCCE 3.4.3" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_hostenv_compilationtoolchains_gcce-3.4.3"/>
-     -->
-</component>
-<component name="n:gcce-4.3.2" long-name="GCCE 4.3.2" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-      <unit prebuilt="dev_hostenv_compilationtoolchains_gcce-4.3.2"/>
-     -->
-</component>
-<component name="n:legacycommonperl" long-name="Legacy Common Perl Libraries" purpose="development">
-<unit bldFile="os\buildtools\perltoolsplat_os\legacycommonperl\group" mrp="os\buildtools\perltoolsplat_os\legacycommonperl\group\tools_sdk_eng_perllibrary.mrp"/>
-</component>
-<component name="n:commonperl" long-name="Common Perl Libraries" purpose="development">
-<unit bldFile="os\buildtools\perltoolsplat_os\commonperl\group" mrp="os\buildtools\perltoolsplat_os\commonperl\group\tools_sdk_eng_perl_shared.mrp"/>
-</component>
 </collection>
 <collection name="sbsv1_os" long-name="Symbian Build System v1" level="fw">
 <component name="e32toolp" long-name="E32 Perl Tools" purpose="development" class="PC">
 <unit bldFile="os\buildtools\sbsv1_os\e32toolp\group" mrp="os\buildtools\sbsv1_os\e32toolp\group\tools_e32toolp.mrp"/>
 </component>
-<component name="n:bldtools" long-name="Build Tools" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\sbsv1_os\bldtools\group" mrp="os\buildtools\sbsv1_os\bldtools\group\tools_sdk_eng_build-tools.mrp"/>
-</component>
 <component name="romutils" long-name="ROM Utilities" filter="gt" purpose="development">
 <unit bldFile="os\buildtools\sbsv1_os\romutils\group" mrp="os\buildtools\sbsv1_os\romutils\group\tools_romutils.mrp"/>
 </component>
 </collection>
-<collection name="n:srcanamdw_os" long-name="Source Analysis Middleware" level="fw">
-<component name="n:leavescan" long-name="Leavescan" purpose="development">
-<unit bldFile="os\buildtools\srcanamdw_os\leavescan\group" mrp="os\buildtools\srcanamdw_os\leavescan\group\testtools_leavescan.mrp"/>
-</component>
-<component name="n:programchecker" long-name="Program Checker" deprecated="tb91" purpose="development">
-<unit bldFile="os\buildtools\srcanamdw_os\programchecker\group" mrp="os\buildtools\srcanamdw_os\programchecker\group\testtools_programchecker.mrp"/>
-</component>
-<component name="n:migrationtool" long-name="Migration Tool" purpose="development">
-<unit bldFile="os\buildtools\srcanamdw_os\migrationtool\group" mrp="os\buildtools\srcanamdw_os\migrationtool\group\testtools_migrationtool.mrp"/>
-</component>
-</collection>
 <collection name="imgtools_os" long-name="Image Tools" level="fw">
 <component name="romkiteka2" long-name="ROMKIT EKA2" deprecated="tb91" purpose="development">
 <unit bldFile="os\buildtools\imgtools_os\romkiteka2\group" mrp="os\buildtools\imgtools_os\romkiteka2\group\tools_romkit.mrp"/>
 </component>
-<component name="n:romtools" long-name="ROM Tools" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-     <unit prebuilt="dev_build_imgtools_romtools"/>
-     -->
-</component>
-<component name="n:buildrom" long-name="Build ROM" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-     <unit prebuilt="dev_build_imgtools_buildrom"/>
-     -->
-</component>
-<component name="n:imglib" long-name="ROM/ROFS Image Library" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-     <unit prebuilt="dev_build_imgtools_imglib"/>
-     -->
-</component>
-<component name="n:sisutils" long-name="SIS Utility Library" purpose="development" class="placeholder">
-<!-- PLACEHOLDER="DS.1756"
-     <unit prebuilt="dev_build_imgtools_sisutils"/>
-     -->
-</component>
-</collection>
-<collection name="n:binanamdw_os" long-name="Binary Analysis Middleware" level="fw">
-<component name="n:captools" long-name="Capability Tools" purpose="development">
-<unit bldFile="os\buildtools\binanamdw_os\captools\group" mrp="os\buildtools\binanamdw_os\captools\group\testtools_captools.mrp"/>
-</component>
-<component name="n:depcheck" long-name="Dependency Checker" purpose="development">
-<unit bldFile="os\buildtools\binanamdw_os\depcheck" mrp="os\buildtools\binanamdw_os\depcheck\tools_depcheck.mrp"/>
-</component>
-</collection>
-<collection name="n:devlib" long-name="Developer Library" level="ui">
-<component name="n:devlibhelp" long-name="Developer Library Help" purpose="development" class="doc">
-<unit bldFile="os\buildtools\devlib\devlibhelp\group\devlib96" mrp="os\buildtools\devlib\devlibhelp\group\devlib96\developerlibrary_doc_html.mrp" version="9.6"/>
-</component>
-<component name="n:devlibsrc" long-name="Developer Library Source" filter="gt" purpose="development" class="doc">
-<unit bldFile="os\buildtools\devlib\devlibhelp\securitysupplement\doc_source" mrp="os\buildtools\devlib\devlibhelp\developerlibrary_doc_source.mrp"/>
-</component>
-<component name="n:devlibhtml" long-name="Developer Library HTML" purpose="development" class="doc">
-<unit mrp="os\buildtools\devlib\devlibhelp\group\shared\developerlibrary_doc_plain_html.mrp"/>
-</component>
-<component name="n:toolsdocs" long-name="Tools Documentation" purpose="development" class="doc">
-<unit mrp="os\buildtools\devlib\toolsdocs\tools_documentation.mrp"/>
-</component>
 </collection>
 <collection name="misccomponents" long-name="Misc Components" level="mw">
-<component name="n:runperl" long-name="Run PERL" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\runperl\group" mrp="os\buildtools\misccomponents\runperl\group\tools_sdk_eng_runperl.mrp"/>
-</component>
-<component name="n:assertion" long-name="Assertion" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\assertion\group" mrp="os\buildtools\misccomponents\assertion\group\tools_sdk_eng_assertion.mrp"/>
-</component>
-<component name="n:enum" long-name="Enum" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\enum\group" mrp="os\buildtools\misccomponents\enum\group\tools_sdk_eng_enum.mrp"/>
-</component>
-<component name="n:logger" long-name="Logger" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\logger\group" mrp="os\buildtools\misccomponents\logger\group\tools_sdk_eng_logger.mrp"/>
-</component>
-<component name="n:filesys" long-name="Filesys" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\filesys\group" mrp="os\buildtools\misccomponents\filesys\group\tools_sdk_eng_filesys.mrp"/>
-</component>
-<component name="n:envvar" long-name="Envvar" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\envvar\group" mrp="os\buildtools\misccomponents\envvar\group\tools_sdk_eng_envvar.mrp"/>
-</component>
-<component name="n:installutils" long-name="Install Utils" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\installutils\group" mrp="os\buildtools\misccomponents\installutils\group\tools_sdk_eng_installutils.mrp"/>
-</component>
-<component name="n:mnemonicfix" long-name="Mnemonic Fix" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\mnemonicfix\group" mrp="os\buildtools\misccomponents\mnemonicfix\group\tools_sdk_eng_mnemonicfix.mrp"/>
-</component>
-<component name="n:pathbrowser" long-name="Path Browser" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\pathbrowser\group" mrp="os\buildtools\misccomponents\pathbrowser\group\tools_sdk_eng_pathbrowser.mrp"/>
-</component>
-<component name="n:shellexec" long-name="Shell Exec" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\shellexec\group" mrp="os\buildtools\misccomponents\shellexec\group\tools_sdk_eng_shellexec.mrp"/>
-</component>
-<component name="n:swingworker" long-name="Swing Worker" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\swingworker\group" mrp="os\buildtools\misccomponents\swingworker\group\tools_sdk_eng_swingworker.mrp"/>
-</component>
-<component name="n:testcaserunner" long-name="Test Case Runner" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\testcaserunner\group" mrp="os\buildtools\misccomponents\testcaserunner\group\tools_sdk_eng_testcaserunner.mrp"/>
-</component>
-<component name="n:toolbarpanel" long-name="Tool Bar Panel" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\toolbarpanel\group" mrp="os\buildtools\misccomponents\toolbarpanel\group\tools_sdk_eng_toolbarpanel.mrp"/>
-</component>
-<component name="n:javahelp" long-name="Java Help" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\javahelp\group" mrp="os\buildtools\misccomponents\javahelp\group\tools_sdk_eng_javahelp.mrp"/>
-</component>
-<component name="n:langconfig" long-name="Language Config" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\langconfig\group" mrp="os\buildtools\misccomponents\langconfig\group\tools_sdk_eng_langconfig.mrp"/>
-</component>
-<component name="n:sdkinfo" long-name="SDK Info" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\sdkinfo\group" mrp="os\buildtools\misccomponents\sdkinfo\group\tools_sdk_eng_sdkinfo.mrp"/>
-</component>
-<component name="n:jade" long-name="Jade " filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\jade\group" mrp="os\buildtools\misccomponents\jade\group\tools_sdk_eng_jade.mrp"/>
-</component>
-<component name="n:sdkpackagemgr" long-name="SDK Package Manager" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\sdkpackagemgr\group" mrp="os\buildtools\misccomponents\sdkpackagemgr\group\tools_sdk_eng_sdkpkg-manager.mrp"/>
-</component>
-<component name="n:sdkpkgtools" long-name="SDK Package Tools" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\sdkpkgtools\group" mrp="os\buildtools\misccomponents\sdkpkgtools\group\tools_sdk_eng_sdkpkg-tools.mrp"/>
-</component>
 <component name="emulatorlauncher" long-name="Emulator Launcher" filter="gt" purpose="development">
 <unit bldFile="os\buildtools\misccomponents\emulatorlauncher\group" mrp="os\buildtools\misccomponents\emulatorlauncher\group\tools_sdk_eng_emulator_launcher.mrp"/>
 </component>
-<component name="n:pkgmgrgui" long-name="SDK Package Manager GUI" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\pkgmgrgui\group" mrp="os\buildtools\misccomponents\pkgmgrgui\group\tools_sdk_eng_pkgmgrgui.mrp"/>
-</component>
-<component name="n:launch" long-name="Launch" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\launch\group" mrp="os\buildtools\misccomponents\launch\group\tools_sdk_eng_launch.mrp"/>
-</component>
-<component name="n:toolsstubs" long-name="Devices Tools Stubs" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\toolsstubs\group" mrp="os\buildtools\misccomponents\toolsstubs\group\tools_sdk_eng_tools_stubs.mrp"/>
-</component>
-<component name="n:bspbuilder" long-name="BSP Builder" filter="gt" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\bspbuilder\group" mrp="os\buildtools\misccomponents\bspbuilder\group\tools_bspbuilder.mrp"/>
-</component>
-<component name="n:splash" long-name="Splash Screen" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\splash\group" mrp="os\buildtools\misccomponents\splash\group\tools_sdk_eng_splash.mrp"/>
-</component>
-<component name="n:sdkbuilder" long-name="SDK Building Tools" purpose="development">
-<unit bldFile="os\buildtools\misccomponents\sdkbuilder\group" mrp="os\buildtools\misccomponents\sdkbuilder\group\tools_sdk_eng_sdk_builder.mrp"/>
-</component>
-</collection>
-<collection name="n:javatoolsplat" long-name="Java Tools Platform" level="mw">
-<component name="n:javalib" long-name="Java Library " filter="gt" purpose="development">
-<unit bldFile="os\buildtools\javatoolsplat\javalib\group" mrp="os\buildtools\javatoolsplat\javalib\group\tools_sdk_eng_javalibrary.mrp"/>
-</component>
-</collection>
-<collection name="n:fileconv" long-name="File Converters" level="mw">
-<component name="n:cjpeg" long-name="CJpeg" purpose="development">
-<unit bldFile="os\buildtools\fileconv\cjpeg\group" mrp="os\buildtools\fileconv\cjpeg\group\tools_sdk_eng_cjpeg.mrp"/>
-</component>
-<component name="n:alp2csh" long-name="ALP to CSH" purpose="development">
-<unit bldFile="os\buildtools\fileconv\alp2csh\group" mrp="os\buildtools\fileconv\alp2csh\group\tools_sdk_eng_alp2csh.mrp"/>
-</component>
-<component name="n:rtf2ptml" long-name="RTF to PTML" purpose="development">
-<unit bldFile="os\buildtools\fileconv\rtf2ptml\group" mrp="os\buildtools\fileconv\rtf2ptml\group\tools_sdk_eng_rtf2ptml.mrp"/>
-</component>
 </collection>
 <collection name="buildtools_info" long-name="Build Tools Info" level="ui">
 <component name="buildtools_metadata" long-name="Build Tools Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\buildtools\buildtools_info\buildtools_metadata\buildtools_metadata.mrp"/>
 </component>
-<component name="n:nokia_buildtools_metadata" long-name="Nokia Build Tools Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\buildtools\buildtools_info\nokia_buildtools_metadata\nokia_buildtools_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="ossrv" level="services" long-name="Generic OS Services" levels="physical-abstraction app-libs encoding translation data-services utilities">
@@ -809,9 +388,6 @@
 </component>
 </collection>
 <collection name="contentmgmt" long-name="Content Management" level="utilities">
-<component name="n:cafstreamingsupport" long-name="CAF Streaming Support" introduced="tb92" purpose="optional">
-<unit bldFile="os\security\contentmgmt\cafstreamingsupport\group" mrp="os\security\contentmgmt\cafstreamingsupport\group\security_streamingcaf.mrp"/>
-</component>
 <component name="contentaccessfwfordrm" long-name="Content Access Framework for DRM" introduced="9.1" purpose="mandatory">
 <unit bldFile="os\security\contentmgmt\contentaccessfwfordrm\group" mrp="os\security\contentmgmt\contentaccessfwfordrm\group\security_caf2.mrp"/>
 </component>
@@ -829,9 +405,6 @@
 <component name="strongcryptospi" long-name="Strong Crypto SPI" filter="gt" introduced="tb92" purpose="optional">
 <unit bldFile="os\security\crypto\weakcryptospi\strong" mrp="os\security\crypto\weakcryptospi\group\security_cryptospi_strong.mrp"/>
 </component>
-<component name="n:opencryptolibs" long-name="Open Crypto Libraries" introduced="tb92" purpose="optional">
-<unit bldFile="os\security\crypto\opencryptolibs\group" mrp="os\security\crypto\opencryptolibs\group\oeaddons_crypto.mrp"/>
-</component>
 </collection>
 <collection name="cryptomgmtlibs" long-name="Crypto Management Libraries" level="management">
 <component name="securityutils" long-name="Security Utils" introduced="8.0" purpose="optional">
@@ -870,28 +443,16 @@
 <component name="filebasedcertificateandkeystores" long-name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
 <unit bldFile="os\security\cryptoservices\filebasedcertificateandkeystores\group" mrp="os\security\cryptoservices\filebasedcertificateandkeystores\group\security_filetokens.mrp"/>
 </component>
-<component name="n:rootcertificates" long-name="Root Certificates" introduced="7.0s" purpose="optional">
-<unit mrp="os\security\cryptoservices\rootcertificates\rootcerts.mrp"/>
-</component>
 <component name="asnpkcs" long-name="ASN PKCS" introduced="8.0" purpose="optional">
 <unit bldFile="os\security\cryptoservices\asnpkcs\group" mrp="os\security\cryptoservices\asnpkcs\group\security_asnpkcs.mrp"/>
 </component>
-<component name="n:openssl" long-name="OpenSSL" introduced="tb92" purpose="optional">
-<unit bldFile="os\security\cryptoservices\openssl\group" mrp="os\security\cryptoservices\openssl\group\oeaddons_ssl.mrp"/>
-</component>
 </collection>
 <collection name="authenticationservices" long-name="Authentication Services" level="utilities">
-<component name="n:authenticationserver" long-name="Authentication Server" introduced="tb92" purpose="optional">
-<unit bldFile="os\security\authenticationservices\authenticationserver\group" mrp="os\security\authenticationservices\authenticationserver\group\security_authserver.mrp"/>
-</component>
 </collection>
 <collection name="security_info" long-name="OS Security Info" level="utilities">
 <component name="security_metadata" long-name="OS Security Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\security\security_info\security_metadata\security_metadata.mrp"/>
 </component>
-<component name="n:nokia_security_metadata" long-name="Nokia OS Security Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\security\security_info\nokia_security_metadata\nokia_security_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="persistentdata" level="services" long-name="Persistent Data Services" levels="adaptation hw-if plugin framework server app-if">
@@ -1011,9 +572,6 @@
 <component name="simulationpositioningmodule" long-name="Simulation Positioning Module" introduced="tb91" purpose="development" plugin="Y">
 <unit bldFile="os\lbs\datasourcemodules\simulationpositioningmodule\group" mrp="os\lbs\datasourcemodules\simulationpositioningmodule\group\lbs_simulation_positioning_module.mrp"/>
 </component>
-<component name="n:agpsintegrationmodule" long-name="A-GPS Integration Module" introduced="9.2" purpose="optional" plugin="Y">
-<unit bldFile="os\lbs\datasourcemodules\agpsintegrationmodule\group" mrp="os\lbs\datasourcemodules\agpsintegrationmodule\group\lbs_datasourceplugins.mrp"/>
-</component>
 <component name="gpspositioningmodule" long-name="GPS/A-GPS Positioning Module" introduced="tb92" purpose="optional" plugin="Y">
 <unit bldFile="os\lbs\datasourcemodules\gpspositioningmodule\group" mrp="os\lbs\datasourcemodules\gpspositioningmodule\group\lbs_agps_positioning_module.mrp"/>
 </component>
@@ -1068,9 +626,6 @@
         <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
 		-->
 </component>
-<component name="n:suplprotocolmodule" long-name="SUPL Protocol Module" introduced="tb91" deprecated="tb91" purpose="optional" plugin="Y">
-<unit bldFile="os\lbs\networkprotocolmodules\suplprotocolmodule\group" mrp="os\lbs\networkprotocolmodules\suplprotocolmodule\group\lbs_suplprotocolmodule.mrp"/>
-</component>
 </collection>
 <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
 <component name="lbshaitest" long-name="Location HAI Tests" introduced="tb91" purpose="development">
@@ -1081,9 +636,6 @@
 <component name="lbs_metadata" long-name="Locating Services Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\lbs\lbs_info\lbs_metadata\lbs_metadata.mrp"/>
 </component>
-<component name="n:nokia_lbs_metadata" long-name="Nokia Locating Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\lbs\lbs_info\nokia_lbs_metadata\nokia_lbs_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="commsfw" level="services" long-name="Communications Framework" levels="server support framework process app-if">
@@ -1297,9 +849,6 @@
 <component name="ipsec" long-name="IPsec" introduced="7.0" purpose="optional">
 <unit bldFile="os\networkingsrv\networksecurity\ipsec\group" mrp="os\networkingsrv\networksecurity\ipsec\group\networking_ipsec.mrp"/>
 </component>
-<component name="n:ipsecvpn" long-name="IPsec VPN" introduced="tb91" purpose="development">
-<unit bldFile="os\networkingsrv\networksecurity\ipsecvpn\group" mrp="os\networkingsrv\networksecurity\ipsecvpn\group\networking_ipsecvpn.mrp"/>
-</component>
 </collection>
 <collection name="networkingtestandutils" long-name="Networking Test and Utils" level="app-if">
 <component name="networkingunittest" long-name="Networking Unit Test" introduced="7.0" purpose="development">
@@ -1338,9 +887,6 @@
 <component name="networkingsrv_metadata" long-name="Networking Services Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\networkingsrv\networkingsrv_info\networkingsrv_metadata\networkingsrv_metadata.mrp"/>
 </component>
-<component name="n:nokia_networkingsrv_metadata" long-name="Nokia Networking Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\networkingsrv\networkingsrv_info\nokia_networkingsrv_metadata\nokia_networkingsrv_metadata.mrp"/>
-</component>
 </collection>
 <collection name="pppcompressionplugins" long-name="PPP Compression Plugins" level="plugin">
 <component name="predictorcompression" long-name="Predictor Compression" introduced="6.0" purpose="optional" plugin="Y">
@@ -1563,21 +1109,10 @@
 </collection>
 </block>
 <block name="usb" level="services" long-name="USB" levels="adaptation hw-if plugin framework server app-if">
-<collection name="n:usbbsptemplate" long-name="USB BSP Template" level="adaptation">
-<component name="n:usbhostcntrldrivertemplate" long-name="OMAP USB Host Controller Driver Template" introduced="tb92" filter="gt" purpose="optional">
-<unit bldFile="os\usb\usbbsptemplate\usbhostcntrldrivertemplate" mrp="os\usb\usbbsptemplate\usbhostcntrldrivertemplate\base_template_usbhostotg.mrp"/>
-</component>
-</collection>
 <collection name="usbldd" long-name="USB Logical Device Drivers" level="hw-if">
 <component name="usbclientdrivers" long-name="USB Client Drivers" introduced="8.1b" purpose="optional">
 <unit bldFile="os\kernelhwsrv\kernel\eka\drivers\usbc" mrp="os\kernelhwsrv\kernel\eka\drivers\usbc\base_e32_drivers_usbcli.mrp"/>
 </component>
-<component name="n:usbhotgdrivers" long-name="USB Host and OTG Drivers" introduced="tb92" filter="gt" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\usbho" mrp="os\kernelhwsrv\kernel\eka\drivers\usbho\base_drivers_usbhostotg.mrp"/>
-</component>
-<component name="n:usbhostandotgstack" long-name="USB Host and OTG Stack" introduced="tb92" filter="gt" purpose="optional">
-<unit bldFile="os\kernelhwsrv\kernel\eka\drivers\usbho\usbd" mrp="os\kernelhwsrv\kernel\eka\drivers\usbho\usbd\base_drivers_usbhostotg_usbware.mrp"/>
-</component>
 </collection>
 <collection name="usbmgmt" long-name="USB Management" level="server">
 <component name="usbmgr" long-name="USB Manager" purpose="optional">
@@ -1589,17 +1124,11 @@
 <component name="usbclassandmgrdocs" long-name="USB Class and Manager Documentation" purpose="development" class="doc">
 <unit mrp="os\usb\usbmgmt\usbclassandmgrdocs\usb_documentation.mrp"/>
 </component>
-<component name="n:usbrndis" long-name="USB RNDIS" introduced="tb92" filter="gt" purpose="optional" plugin="Y">
-<unit bldFile="os\usb\usbmgmt\usbrndis\group" mrp="os\usb\usbmgmt\usbrndis\group\usb_rndis.mrp"/>
-</component>
 </collection>
 <collection name="usb_info" long-name="USB Info" level="app-if">
 <component name="usb_metadata" long-name="USB Metadata" introduced="tb92" purpose="development" class="config PC">
 <unit mrp="os\usb\usb_info\usb_metadata\usb_metadata.mrp"/>
 </component>
-<component name="n:nokia_usb_metadata" long-name="Nokia USB Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\usb\usb_info\nokia_usb_metadata\nokia_usb_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="mm" level="services" long-name="Multimedia" levels="adaptation hw-if device-fw devices middleware app-if">
@@ -1631,9 +1160,6 @@
 </component>
 </collection>
 <collection name="mmplugins" long-name="Multimedia Plugins" level="middleware">
-<component name="n:capsadaptation" long-name="CAPS Adaptation" introduced="tb92" purpose="optional">
-<unit bldFile="os\mm\imagingandcamerafws\imagingfws\plugins\CAPSAdaptation\group" mrp="os\mm\imagingandcamerafws\imagingfws\plugins\CAPSAdaptation\group\multimedia_icl_capsadaptation.mrp"/>
-</component>
 <component name="imagingplugins" long-name="Imaging Plugins" introduced="7.0s" purpose="optional" plugin="Y">
 <unit bldFile="os\mm\imagingandcamerafws\imagingfws\plugins\group" mrp="os\mm\imagingandcamerafws\imagingfws\plugins\group\multimedia_icl_plugin.mrp"/>
 </component>
@@ -1654,9 +1180,6 @@
 <component name="mm_metadata" long-name="Multimedia Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\mm\mm_info\mm_metadata\mm_metadata.mrp"/>
 </component>
-<component name="n:nokia_mm_metadata" long-name="Nokia Multimedia Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\mm\mm_info\nokia_mm_metadata\nokia_mm_metadata.mrp"/>
-</component>
 </collection>
 <collection name="mmresourcemgmt" long-name="Multimedia Resource Management" level="middleware">
 <component name="mmresctrl" long-name="Multimedia Resource Controller" introduced="tb91" purpose="development">
@@ -1842,20 +1365,6 @@
       </component>
     </collection>
 	-->
-<collection name="n:mmpacketvideo" long-name="Multimedia PacketVideo" level="middleware">
-<component name="n:mmpvcodecs" long-name="PacketVideo Codecs" introduced="tb92" purpose="development" plugin="Y">
-<unit bldFile="os\mm\mmpacketvideo\mmpvcodecs\group" mrp="os\mm\mmpacketvideo\mmpvcodecs\group\multimedia_pv_aac.mrp"/>
-</component>
-<component name="n:omxilpvcomps" long-name="OpenMAX IL PacketVideo Components" introduced="tb92" purpose="development">
-<unit bldFile="os\mm\mmpacketvideo\omxilpvcomps\group" mrp="os\mm\mmpacketvideo\omxilpvcomps\group\multimedia_omx_il_pv_comps.mrp"/>
-</component>
-<component name="n:mmilapipv" long-name="Multimedia Integration Layer API PacketVideo" introduced="tb92" purpose="development">
-<unit bldFile="os\mm\mmpacketvideo\mmilapipv\group" mrp="os\mm\mmpacketvideo\mmilapipv\group\multimedia_il_api_pv.mrp"/>
-</component>
-<component name="n:a3fpvintegrationtest" long-name="A3F PacketVideo Integration Tests" introduced="tb92" purpose="development">
-<unit mrp="os\mm\mmpacketvideo\a3fpvintegrationtest\group\multimedia_inttest_pv_a3f_devsound_source.mrp"/>
-</component>
-</collection>
 <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
 <component name="mmsvs" long-name="Multimedia Verification Suite" introduced="tb91" purpose="development">
 <unit mrp="os\mm\mmapitest\mmsvs\group\mmsvs.mrp"/>
@@ -1893,27 +1402,6 @@
 <unit bldFile="os\graphics\graphicshwdrivers\surfacemgr\group" mrp="os\graphics\graphicshwdrivers\surfacemgr\group\graphics_surfacemanager.mrp"/>
 </component>
 </collection>
-<collection name="n:graphicscomposition" long-name="Graphics Composition" level="engines">
-<component name="n:graphicscompositionengine" long-name="Graphics Composition Engine" introduced="tb92" purpose="optional">
-<unit bldFile="os\graphics\graphicscomposition\graphicscompositionengine\group" mrp="os\graphics\graphicscomposition\graphicscompositionengine\group\graphics_gce.mrp"/>
-</component>
-<component name="n:compositionengineadaptation" long-name="Composition Engine Adaptation" introduced="tb92" purpose="optional">
-<unit bldFile="os\graphics\graphicscomposition\compositionengineadaptation\group" mrp="os\graphics\graphicscomposition\compositionengineadaptation\group\graphics_compositionbackend.mrp"/>
-</component>
-<component name="n:compositionengineadaptationsgx" long-name="SGX Backend" introduced="tb92" purpose="optional" class="placeholder">
-<!-- PLACEHOLDER="DS.1539"
-         <unit mrp="../../graphicscomposition/compositionengineadaptationsgx/group/compositionengineadaptationsgx.mrp"/>
-     -->
-</component>
-<component name="n:compositionengineadaptationmbx" long-name="MBX Backend" introduced="tb92" purpose="optional" class="placeholder">
-<!-- PLACEHOLDER="DS.1724"
-         <unit mrp="../../graphicscomposition/compositionengineadaptationmbx/group/compositionengineadaptationmbx.mrp"/>
-     -->
-</component>
-<component name="n:surfaceupdate" long-name="Surface Update" introduced="tb92" purpose="optional">
-<unit bldFile="os\graphics\graphicscomposition\surfaceupdate\group" mrp="os\graphics\graphicscomposition\surfaceupdate\group\graphics_surfaceupdate.mrp"/>
-</component>
-</collection>
 <collection name="graphicstest" long-name="Graphics Test" level="app-if">
 <component name="graphicstestharness" long-name="Graphics Test Harness" introduced="8.1" purpose="development">
 <unit mrp="os\graphics\graphicstest\graphicstestharness\group\graphics_testharness.mrp"/>
@@ -1929,18 +1417,8 @@
 <component name="graphics_metadata" long-name="Graphics Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\graphics\graphics_info\graphics_metadata\graphics_metadata.mrp"/>
 </component>
-<component name="n:nokia_graphics_metadata" long-name="Nokia Graphics Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\graphics\graphics_info\nokia_graphics_metadata\nokia_graphics_metadata.mrp"/>
-</component>
 </collection>
 <collection name="windowing" long-name="Windowing" level="app-if">
-<component name="n:windowserver" long-name="Window Server" purpose="mandatory">
-<!-- intentionally not for the foundation despite being a mandatory component -->
-<unit bldFile="os\graphics\windowing\windowserver\group" mrp="os\graphics\windowing\windowserver\group\graphics_wserv.mrp"/>
-</component>
-<component name="n:windowserverplugins" long-name="Window Server Plugins" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="os\graphics\windowing\windowserverplugins\group" mrp="os\graphics\windowing\windowserverplugins\group\graphics_wserv_std_plugins.mrp"/>
-</component>
 </collection>
 <collection name="printingservices" long-name="Printing Services" level="app-if">
 <component name="printerdriversupport" long-name="Printer Driver Support" purpose="optional">
@@ -1959,28 +1437,16 @@
 <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional">
 <unit bldFile="os\graphics\opengles\openglesinterface\group" mrp="os\graphics\opengles\openglesinterface\group\graphics_openglesheaders.mrp"/>
 </component>
-<component name="n:openglesimplementation" long-name="OpenGL ES Implementation" filter="gt" introduced="8.0" purpose="development">
-<unit bldFile="os\graphics\opengles\openglesimplementation\group" mrp="os\graphics\opengles\openglesimplementation\group\graphics_opengles.mrp"/>
-</component>
-<component name="n:openglesdisplayproperties" long-name="OpenGL ES Display Properties" introduced="8.0" purpose="optional">
-<unit bldFile="os\graphics\opengles\openglesdisplayproperties\group" mrp="os\graphics\opengles\openglesdisplayproperties\group\graphics_openglesdisplayproperty.mrp"/>
-</component>
 </collection>
 <collection name="openvg" long-name="OpenVG" level="internal-adaptations">
 <component name="openvginterface" long-name="OpenVG Interface" introduced="tb91" purpose="optional">
 <unit bldFile="os\graphics\openvg\openvginterface\group" mrp="os\graphics\openvg\openvginterface\group\graphics_openvgheaders.mrp"/>
 </component>
-<component name="n:openvgimplementation" long-name="OpenVG Implementation" introduced="tb92" purpose="optional">
-<unit bldFile="os\graphics\openvg\openvgimplementation\group" mrp="os\graphics\openvg\openvgimplementation\group\graphics_openvg.mrp"/>
-</component>
 </collection>
 <collection name="egl" long-name="EGL" level="internal-adaptations">
 <component name="eglinterface" long-name="EGL Interface" introduced="tb91" purpose="optional">
 <unit bldFile="os\graphics\egl\eglinterface\group" mrp="os\graphics\egl\eglinterface\group\graphics_eglheaders.mrp"/>
 </component>
-<component name="n:eglimplementation" long-name="EGL Implementation" introduced="tb91" purpose="optional">
-<unit bldFile="os\graphics\egl\eglimplementation\group" mrp="os\graphics\egl\eglimplementation\group\graphics_egl.mrp"/>
-</component>
 </collection>
 <collection name="graphicsdeviceinterface" long-name="Graphics Device Interface" level="device-interface">
 <component name="gdi" long-name="GDI" purpose="mandatory">
@@ -2044,17 +1510,9 @@
 <component name="freetypefontrasteriser" long-name="FreeType Font Rasteriser" purpose="optional" plugin="Y">
 <unit bldFile="os\textandloc\fontservices\freetypefontrasteriser\group" mrp="os\textandloc\fontservices\freetypefontrasteriser\group\graphics_freetype.mrp"/>
 </component>
-<component name="n:itypefontrasteriser" long-name="iType Font Rasteriser" filter="gt" introduced="tb91" purpose="development" plugin="Y">
-<unit bldFile="os\graphics\fbs\itypefontrasteriser\group" mrp="os\graphics\fbs\itypefontrasteriser\group\graphics_itype.mrp"/>
-</component>
 <component name="referencefonts" long-name="Reference Fonts" introduced="6.0" purpose="optional">
 <unit bldFile="os\textandloc\fontservices\referencefonts\group" mrp="os\textandloc\fontservices\referencefonts\group\graphics_fonts.mrp"/>
 </component>
-<component name="n:testfonts" long-name="Test Fonts" filter="gt" introduced="tb91" purpose="development" class="placeholder">
-<!-- placeholder 
-        <unit bldFile="../../fontservices/graphicstestfonts/group" mrp="../../fontservices/graphicstestfonts/group/graphics_testfonts.mrp"/>
-        -->
-</component>
 </collection>
 <collection name="textlayout" long-name="Text Layout" level="text">
 <component name="texthandling" long-name="Text Handling" purpose="optional">
@@ -2095,9 +1553,6 @@
 <component name="textandloc_metadata" long-name="Text and Localisation Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\textandloc\textandloc_info\textandloc_metadata\textandloc_metadata.mrp"/>
 </component>
-<component name="n:nokia_textandloc_metadata" long-name="Nokia Text and Localisation Services Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\textandloc\textandloc_info\nokia_textandloc_metadata\nokia_textandloc_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="xmlsrv" level="services" long-name="XML Services" levels="plugin server framework generic specific">
@@ -2144,18 +1599,10 @@
 <unit mrp="os\deviceplatformrelease\foundation_system\system_model\system_model.mrp"/>
 </component>
 </collection>
-<collection name="n:nokia_system" long-name="Nokia System" level="top">
-<component name="n:nokia_model" long-name="Nokia Model" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\deviceplatformrelease\nokia_system\nokia_model\nokia_model.mrp"/>
-</component>
-</collection>
 <collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
 <component name="deviceplatformrelease_metadata" long-name="Device Platform Release Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="os\deviceplatformrelease\deviceplatformrelease_info\deviceplatformrelease_metadata\deviceplatformrelease_metadata.mrp"/>
 </component>
-<component name="n:nokia_deviceplatformrelease_metadata" long-name="Nokia Device Platform Release Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="os\deviceplatformrelease\deviceplatformrelease_info\nokia_deviceplatformrelease_metadata\nokia_deviceplatformrelease_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="osrndtools" level="services" long-name="OS RD tools" levels="fw trace">
@@ -2334,18 +1781,10 @@
 <unit bldFile="mw\netprotocols\applayerpluginsandutils\httptransportplugins\group" mrp="mw\netprotocols\applayerpluginsandutils\httptransportplugins\group\http_transport-plugin.mrp"/>
 </component>
 </collection>
-<collection name="n:wapstack" long-name="WAP Stack" level="plugin">
-<component name="n:wapmessageapi" long-name="WAP Message API" purpose="optional">
-<unit bldFile="mw\netprotocols\wapstack\wapmessageapi\group" mrp="mw\netprotocols\wapstack\wapmessageapi\group\wap-stack_wapmessage.mrp"/>
-</component>
-</collection>
 <collection name="netprotocols_info" long-name="High-level Internet Protocols Info" level="specific">
 <component name="netprotocols_metadata" long-name="High-level Internet Protocols Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="mw\netprotocols\netprotocols_info\netprotocols_metadata\netprotocols_metadata.mrp"/>
 </component>
-<component name="n:nokia_netprotocols_metadata" long-name="Nokia High-level Internet Protocols Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\netprotocols\netprotocols_info\nokia_netprotocols_metadata\nokia_netprotocols_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="ipappprotocols" level="generic" long-name="IP App Protocols" levels="plugin framework conn server">
@@ -2437,15 +1876,6 @@
 <component name="remoteconn_metadata" long-name="Remote Connectivity Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="mw\remoteconn\remoteconn_info\remoteconn_metadata\remoteconn_metadata.mrp"/>
 </component>
-<component name="n:nokia_remoteconn_metadata" long-name="Nokia Remote Connectivity Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="mw\remoteconn\remoteconn_info\nokia_remoteconn_metadata\nokia_remoteconn_metadata.mrp"/>
-</component>
-<component name="n:connectivitydoc" long-name="Connectivity Documentation" introduced="tb91" purpose="optional" class="doc">
-<unit mrp="mw\remoteconn\remoteconn_info\connectivitydoc\group\connectivity_documentation.mrp"/>
-</component>
-<component name="n:mtpdoc" long-name="MTP Documentation" introduced="tb91" purpose="optional" class="doc">
-<unit mrp="mw\remoteconn\remoteconn_info\mtpdoc\group\mtp_documentation.mrp"/>
-</component>
 </collection>
 <collection name="usbfunctiondrivers" long-name="USB Function Drivers" level="server">
 <component name="massstoragemgr" long-name="Mass Storage Manager" introduced="tb92" purpose="optional">
@@ -2467,9 +1897,6 @@
 <component name="mtpptpiptransport" long-name="MTP PTP-IP Transport" introduced="tb92" purpose="optional" plugin="Y">
 <unit bldFile="mw\remoteconn\mtptransports\mtpptpiptransport\group" mrp="mw\remoteconn\mtptransports\mtpptpiptransport\group\mtp_ptpip.mrp"/>
 </component>
-<component name="n:mtpbttransport" long-name="MTP Bluetooth Transport" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="mw\remoteconn\mtptransports\mtpbttransport\group" mrp="mw\remoteconn\mtptransports\mtpbttransport\group\mtp_bt.mrp"/>
-</component>
 </collection>
 <collection name="mtpfws" long-name="MTP Frameworks" level="framework">
 <component name="mtpfw" long-name="MTP Framework" introduced="tb91" purpose="optional">
@@ -2486,35 +1913,6 @@
 <component name="mtpbackupandrestoredp" long-name="Backup and Restore Provider" introduced="tb92" purpose="optional" plugin="Y">
 <unit bldFile="mw\remoteconn\mtpdataproviders\mtpbackupandrestoredp\group" mrp="mw\remoteconn\mtpdataproviders\mtpbackupandrestoredp\group\mtp_backupnrestoredp.mrp"/>
 </component>
-<component name="n:mtptaskdp" long-name="MTP Task Provider" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="mw\remoteconn\mtpdataproviders\mtptaskdp\group" mrp="mw\remoteconn\mtpdataproviders\mtptaskdp\group\mtp_taskdp.mrp"/>
-</component>
-<component name="n:mtpcalendardp" long-name="MTP Calendar Provider" introduced="tb92" purpose="optional" plugin="Y">
-<unit bldFile="mw\remoteconn\mtpdataproviders\mtpcalendardp\group" mrp="mw\remoteconn\mtpdataproviders\mtpcalendardp\group\mtp_calendardp.mrp"/>
-</component>
-<component name="n:mtpwmpextndp" long-name="WMP Extension Data Provider" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="mw\remoteconn\mtpdataproviders\mtpwmpextndp\group" mrp="mw\remoteconn\mtpdataproviders\mtpwmpextndp\group\mtp_wmpextndp.mrp"/>
-</component>
-<component name="n:mtpimagedp" long-name="MTP Image Data Provider" introduced="tb92" purpose="optional" plugin="Y" class="placeholder">
-<!-- PLACEHOLDER="DS.1819"
-      <unit bldFile="../../mtpdataproviders/mtpimagedp/group" mrp="../../mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
-     -->
-</component>
-<component name="n:mtppictbridgedp" long-name="MTP PictBridge Data Provider" introduced="tb92" purpose="optional" plugin="Y" class="placeholder">
-<!-- PLACEHOLDER="DS.1828"
-      <unit bldFile="../../mtpdataproviders/mtppictbridgedp/group" mrp="../../mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
-     -->
-</component>
-<component name="n:mtpmetadatadp" long-name="MTP Device Metadata Data Provider" introduced="tb92" purpose="optional" plugin="Y" class="placeholder">
-<!-- PLACEHOLDER="DS.1822"
-      <unit bldFile="../../mtpdataproviders/mtpmetadatadp/group" mrp="../../mtpdataproviders/mtpmetadatadp/group/mtp_metadatadp.mrp"/>
-     -->
-</component>
-<component name="n:mtpstatusdp" long-name="MTP Status Data Provider" introduced="tb92" purpose="optional" plugin="Y" class="placeholder">
-<!-- PLACEHOLDER="DS.1821"
-      <unit bldFile="../../mtpdataproviders/mtpstatusdp/group" mrp="../../mtpdataproviders/mtpstatusdp/group/mtp_statusdp.mrp"/>
-     -->
-</component>
 </collection>
 <collection name="backupandrestore" long-name="Backup and Restore" level="specific">
 <component name="backupengine" long-name="Backup Engine" introduced="9.0" purpose="optional">
@@ -2528,9 +1926,6 @@
 <component name="chatscripts" long-name="Chat Scripts" purpose="development">
 <unit bldFile="mw\remoteconn\connectivitypcside\chatscripts\group" mrp="mw\remoteconn\connectivitypcside\chatscripts\group\testtools_chatscripts.mrp"/>
 </component>
-<component name="n:connectqi" long-name="ConnectQI" introduced="9.1" purpose="optional" class="PC">
-<unit mrp="mw\remoteconn\connectivitypcside\connectqi\connectqisdk_mr3.mrp"/>
-</component>
 </collection>
 <collection name="connectivitydevicefws" long-name="Connectivity Device Frameworks" level="framework">
 <component name="connectivityfw" long-name="Connectivity Framework" introduced="7.0s" deprecated="tb91" purpose="optional">
@@ -2715,19 +2110,11 @@
 <component name="pbap" long-name="Bluetooth PBAP" introduced="9.2" purpose="optional">
 <unit bldFile="app\contacts\pimprotocols\pbap\group" mrp="app\contacts\pimprotocols\pbap\group\bluetooth_accesshost.mrp"/>
 </component>
-<component name="n:mtpcontactdp" long-name="MTP Contact Data Provider" purpose="optional" introduced="tb92" plugin="Y" class="placeholder">
-<!-- PLACEHOLDER="DS.1824"
-      <unit bldFile="../../pimprotocols/mtpcontactdp/group" mrp="../../pimprotocols/mtpcontactdp/group/mtp_contactdp.mrp"/>
-     -->
-</component>
 </collection>
 <collection name="contacts_info" long-name="Contacts Apps Info" level="ui">
 <component name="contacts_metadata" long-name="Contacts Apps Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="app\contacts\contacts_info\contacts_metadata\contacts_metadata.mrp"/>
 </component>
-<component name="n:nokia_contacts_metadata" long-name="Nokia Contacts Apps Metadata" introduced="tb92" purpose="development" class="config PC">
-<unit mrp="app\contacts\contacts_info\nokia_contacts_metadata\nokia_contacts_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="organizer" level="apps" span="2" long-name="Organizer Application Suite" levels="support services engine ui">
@@ -2749,17 +2136,11 @@
 <component name="chinesecalendarconverter" long-name="Chinese Calendar Converter" introduced="6.1" purpose="optional">
 <unit bldFile="app\organizer\pimappsupport\chinesecalendarconverter\group" mrp="app\organizer\pimappsupport\chinesecalendarconverter\group\app-services_calcon.mrp"/>
 </component>
-<component name="n:chinesecalendaralg" long-name="Chinese Calendar Algorithm" introduced="tb91" purpose="optional" plugin="Y">
-<unit bldFile="app\organizer\pimappsupport\chinesecalendaralg\group" mrp="app\organizer\pimappsupport\chinesecalendaralg\group\app-services_chinesecalendaralgorithm.mrp"/>
-</component>
 </collection>
 <collection name="organizer_info" long-name="Organizer Application Suite Info" level="ui">
 <component name="organizer_metadata" long-name="Organizer Application Suite Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="app\organizer\organizer_info\organizer_metadata\organizer_metadata.mrp"/>
 </component>
-<component name="n:nokia_organizer_metadata" long-name="Nokia Organizer Application Suite Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="app\organizer\organizer_info\nokia_organizer_metadata\nokia_organizer_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="messaging" level="apps" span="2" long-name="Messaging Apps" levels="mail eng base ui">
@@ -2799,20 +2180,6 @@
 </collection>
 </block>
 <block name="helps" level="apps" span="2" long-name="Help Apps" levels="eng tools unused ui">
-<collection name="n:symhelptools" long-name="Symbian Help Tools" level="tools">
-<component name="n:mbmcodec" long-name="MBM Codec" filter="gt" purpose="development">
-<unit bldFile="app\helps\symhelp\mbmcodec\group" mrp="app\helps\symhelp\mbmcodec\group\tools_sdk_eng_mbmcodec.mrp"/>
-</component>
-<component name="n:cshlpcmpgui" long-name="CSHelp Compiler GUI" filter="gt" purpose="development">
-<unit bldFile="app\helps\symhelp\cshlpcmpgui\group" mrp="app\helps\symhelp\cshlpcmpgui\group\tools_sdk_eng_cshlpcmp_gui.mrp" priority="1010"/>
-</component>
-<component name="n:cshlpcmpfrontend" long-name="CSHelp Compiler Frontend" purpose="development">
-<unit bldFile="app\helps\symhelp\cshlpcmpfrontend\group" mrp="app\helps\symhelp\cshlpcmpfrontend\group\tools_sdk_eng_cshlpcmp_frontend.mrp"/>
-</component>
-<component name="n:cshlpcmpbackend" long-name="CSHelp Compiler Backend" purpose="development">
-<unit mrp="app\helps\symhelp\cshlpcmpbackend\group\tools_sdk_eng_cshlpcmp_backend_srconly.mrp"/>
-</component>
-</collection>
 <collection name="symhelp" long-name="Symbian Help" level="eng">
 <component name="helpmodel" long-name="Help" introduced="6.0" purpose="optional">
 <unit bldFile="app\helps\symhelp\helpmodel\group" mrp="app\helps\symhelp\helpmodel\group\app-services_hlpmodel.mrp"/>
@@ -2822,9 +2189,6 @@
 <component name="helps_metadata" long-name="Help Apps Metadata" introduced="tb91" purpose="development" class="config PC">
 <unit mrp="app\helps\helps_info\helps_metadata\helps_metadata.mrp"/>
 </component>
-<component name="n:nokia_helps_metadata" long-name="Nokia Help Apps Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="app\helps\helps_info\nokia_helps_metadata\nokia_helps_metadata.mrp"/>
-</component>
 </collection>
 </block>
 <block name="techview" level="apps" span="2" long-name="Techview" levels="services ui utils apps1 apps2 apps3">