--- a/symbian4/os/deviceplatformrelease/package_definition.xml	Fri Jun 11 13:07:21 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition.xml	Fri Jun 11 13:34:27 2010 +0100
@@ -12,15 +12,7 @@
       <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
         <unit bldFile="Version/group"/>
       </component>
-    </collection>
-    
-   <collection id="helps_loc2" name="Helps Locale 2" level="top">
-    	<!-- collection is really a component. Need to move down a directory -->    
-      <component id="helps_loc2_build" name="Helps Locale 2 Build" filter="s60">
-        <unit bldFile="helps_loc2/group"/>
-      </component>
-     </collection>
-    
+    </collection>   
     <collection id="symbianosbld" name="Symbian OS Build" level="bld">
       <component id="cedarutils" name="Cedar Utils" purpose="development">
         <unit mrp="symbianosbld/cedarutils/tools_utils_cedar.mrp"/>

--- a/symbian4/os/ossrv/package_definition.xml	Fri Jun 11 13:07:21 2010 +0100
+++ b/symbian4/os/ossrv/package_definition.xml	Fri Jun 11 13:34:27 2010 +0100
@@ -243,9 +243,6 @@
    <component id="openenvcore" name="Open Environment Core" introduced="^2" purpose="mandatory">
     <unit bldFile="genericopenlibs/openenvcore/group" mrp="genericopenlibs/openenvcore/group/openenv.mrp"/>
    </component>
-   <component id="pluggableauthenticationmodulefw" name="Pluggable Authentication Module Framework" introduced="^4" purpose="optional">
-    <unit bldFile="genericopenlibs/pluggableauthenticationmodulefw/group" mrp="genericopenlibs/pluggableauthenticationmodulefw/group/oeaddons_libpam.mrp"/>
-   </component>
    <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
     <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
    </component>