--- a/package_definition.xml	Fri Jun 11 14:46:46 2010 +0300
+++ b/package_definition.xml	Wed Jun 23 19:29:20 2010 +0300
@@ -5,21 +5,10 @@
       <component id="sysdeftools" name="System Definition Tools" purpose="development" introduced="^2">
         <unit mrp="bldsystemtools/sysdeftools/group/sysdeftools.mrp"/>
       </component>
-      <component id="gttechviewbaseline" name="GT Techview Baseline" purpose="development">
-        <unit mrp="packaging/additionalutils/gt_techview_baseline.mrp"/>
-      </component>
       <component id="commonbldutils" name="Common Utils" purpose="development">
         <unit mrp="bldsystemtools/commonbldutils/tools_utils_common.mrp"/>
       </component>
     </collection>
-    <collection id="packaging" name="Packaging" level="ui">
-      <component id="additionalutils" name="Additional Utils" purpose="development">
-        <unit mrp="packaging/additionalutils/additional_unknown_cedar.mrp"/>
-      </component>
-      <component id="dummy" name="Dummy" purpose="development">
-        <unit bldFile="packaging/dummy" mrp="packaging/dummy/additional_dummy.mrp"/>
-      </component>
-    </collection>
     <collection id="toolsandutils" name="Tools and Utils" level="mw">
       <component id="productionbldtools" name="Production Build Tools" filter="gt" purpose="development">
         <unit mrp="toolsandutils/productionbldtools/product_tools.mrp"/>
@@ -27,15 +16,6 @@
       <component id="e32tools" name="E32 Tools" deprecated="^2" purpose="development" target="desktop">
         <unit bldFile="toolsandutils/e32tools/group" mrp="toolsandutils/e32tools/group/tools_e32tools.mrp"/>
       </component>
-      <component id="wincredistribution" name="WinC Redistribution" purpose="development" filter="test">
-        <unit mrp="dist_os/redistributionwinceka2/tools_redistribution_winc.mrp" bldFile="dist_os/redistributionwinceka2"/>
-      </component>
-      <component id="additionalredistribution" name="Additional Redistribution" purpose="development" filter="test">
-        <unit mrp="perltoolsplat_os/redistribution/additional_tools.mrp" bldFile="perltoolsplat_os/redistribution"/>
-      </component>
-      <component id="statapi" name="STAT API" filter="gt" purpose="development">
-        <unit bldFile="toolsandutils/statapi/source/statapi/console" mrp="toolsandutils/statapi/group/testtools_stat_device_gt.mrp"/>
-      </component>
       <component id="wintunnel" name="Wintunnel" purpose="development" filter="test">
         <unit mrp="toolsandutils/wintunnel/group/testtools_WinTunnel_srconly.mrp" bldFile="toolsandutils/wintunnel/group"/>
       </component>
@@ -44,7 +24,7 @@
       </component>
     </collection>
     <collection id="sbsv1_os" name="Symbian Build System v1" level="fw">
-      <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="test">
+      <component id="e32toolp" name="E32 Perl Tools" purpose="development" target="desktop" filter="sf_build">
         <unit mrp="sbsv1_os/e32toolp/group/tools_e32toolp.mrp" bldFile="sbsv1_os/e32toolp/group"/>
       </component>
 	  </collection>