diff -r 4f3d3905165e -r 3181275b39c5 symbian4/single/sysdefs/system_model.xml
--- a/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 13:10:22 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 13:33:57 2010 +0100
@@ -605,9 +605,6 @@
 <component name="openenvcore" long-name="Open Environment Core" introduced="^2" purpose="mandatory">
 <unit bldFile="os/ossrv/genericopenlibs/openenvcore/group" mrp="os/ossrv/genericopenlibs/openenvcore/group/openenv.mrp"/>
 </component>
-<component name="pluggableauthenticationmodulefw" long-name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
-<unit bldFile="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group" mrp="os/ossrv/genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
-</component>
 <component name="posixrealtimeextensions" long-name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
 <unit bldFile="os/ossrv/genericopenlibs/posixrealtimeextensions/group" mrp="os/ossrv/genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
 </component>
@@ -2504,12 +2501,6 @@
 <unit bldFile="os/deviceplatformrelease/Version/group"/>
 </component>
 </collection>
-<collection name="helps_loc2" long-name="Helps Locale 2" level="top">
-<!-- collection is really a component. Need to move down a directory -->
-<component name="helps_loc2_build" long-name="Helps Locale 2 Build" filter="s60">
-<unit bldFile="os/deviceplatformrelease/helps_loc2/group"/>
-</component>
-</collection>
 <collection name="symbianosbld" long-name="Symbian OS Build" level="bld">
 <component name="cedarutils" long-name="Cedar Utils" purpose="development">
 <unit mrp="os/deviceplatformrelease/symbianosbld/cedarutils/tools_utils_cedar.mrp"/>