--- a/symbian3/single/sysdefs/system_model.xml	Fri Apr 30 17:26:20 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Fri Apr 30 17:41:38 2010 +0100
@@ -10663,25 +10663,8 @@
 </component>
 </collection>
 <collection name="java_stubs" long-name="Java Stubs" level="util">
-<!-- uncomment all components when configuration is in place. Currently #included from jrt_build -->
-<component name="javadrmutils" long-name="Java DRM Utils" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtdrmutils/group"/>-->
-</component>
-<component name="javaenvinfo" long-name="Java Environment Info" filter="s60,sf_build" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtenvinfo/group"/>-->
-</component>
-<component name="javaregistry" filter="s60,sf_build" long-name="Java Registry" class="placeholder">
-<!--<unit bldFile="java_stubs/jrtregistry/clientserver/client/group"/>-->
-</component>
-<component name="java_stubs_build" filter="s60,sf_build" long-name="Java Stubs ROM" class="placeholder">
-<!-- Remove the #includes and rename JRT ROM-->
-<!--<unit bldFile="java_stubs/group"/>-->
-</component>
-</collection>
-<collection name="jrt_info" long-name="JRT Info" level="rt">
-<component name="jrt_build" filter="s60" long-name="JRT Build">
-<!--  needed for __JAVA_STUBS condition -->
-<unit bldFile="app/jrt/group"/>
+<component name="java_stubs_build" filter="s60" long-name="JRT Stubs Build">
+<unit bldFile="app/jrt/java_stubs/group"/>
 </component>
 </collection>
 </block>