--- a/symbian2/micro/sysdefs/system_model.xml	Mon Dec 07 15:11:35 2009 +0000
+++ b/symbian2/micro/sysdefs/system_model.xml	Tue Dec 08 12:05:28 2009 +0000
@@ -26,12 +26,7 @@
       <!-- <unit bldFile="os/deviceplatformrelease/sf_config/config/western/group"/> -->
      </component>
     </collection>
-    <collection name="s60bld">
-     <component unofficial="yes" name="buildplatforms" origin-model="foundation">
-      <unit bldFile="tools/buildplatforms/group"/>
-     </component>
-    </collection>
-   <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
+    <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
      <component name="cedarutils" long-name="Cedar Utils" purpose="development" plugin="N" origin-model="Symbian">
       <unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
      </component>
@@ -313,9 +308,6 @@
       <!-- The following unit is removed as non-contributed -->
       <!-- <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" plugin="N" origin-model="Symbian">
-      <unit bldFile="os/buildtools/toolsandutils/autotest/group" mrp="os/buildtools/toolsandutils/autotest/group/tools_autotest.mrp"/>
-     </component>
      <component name="n:testconfigfileparser" long-name="Test Config File Parser" purpose="development" plugin="N" origin-model="Symbian">
       <!-- The following unit is removed as non-contributed -->
       <!-- <unit bldFile="os/buildtools/toolsandutils/testconfigfileparser/group" mrp="os/buildtools/toolsandutils/testconfigfileparser/group/tools_testconfigfileparser.mrp"/> -->