--- a/symbian4/single/sysdefs/auto/system_model.xml	Thu Sep 09 10:13:02 2010 +0100
+++ b/symbian4/single/sysdefs/auto/system_model.xml	Thu Sep 09 11:33:16 2010 +0100
@@ -253,19 +253,7 @@
 </component>
 </collection>
 </block>
-<block name="openmaxil.nokia" level="mw" long-name="Nokia OpenMAX IL Adaptation" levels="adaptation hw-if device-fw">
-<collection name="omxilcomp" long-name="OpenMAX IL Components" level="adaptation">
-<component name="omxilgeneric" long-name="Generic OpenMAX IL Components" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxilgeneric/group" version="1"/>
-</component>
-<component name="omxilaudioemulator" long-name="OpenMAX IL Audio Emulator" introduced="^3" purpose="optional" plugin="Y">
-<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxilaudioemulator/group" version="1"/>
-</component>
-<component name="omxiltestcomp" long-name="OpenMAX IL Test Components" introduced="^3" purpose="development" plugin="Y">
-<unit bldFile="adapt/openmaxil.nokia/omxilcomp/omxiltestcomp/group" version="1"/>
-</component>
-</collection>
-</block>
+<block name="openmaxil.nokia" level="mw"/>
 </layer>
 <layer name="os" long-name="OS" levels="hw services">
 <block name="kernelhwsrv" level="hw" long-name="Kernel and Hardware Services" levels="hw-if adaptation framework test">