--- a/symbian3/app/commonemail/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/app/commonemail/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -139,9 +139,6 @@
           <component name="contactactionmenu" filter="s60" long-name="Contact Action Menu" introduced="^2" plugin="Y">
             <unit bldFile="/sf/app/commonemail/emailcontacts/contactactionmenu/group"/>
           </component>
-          <component name="remotecontactlookup" filter="s60" long-name="Remote Contact Lookup" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/app/commonemail/emailcontacts/remotecontactlookup/group"/>
-          </component>
         </collection>
         <collection name="meetingrequest" long-name="Meeting Request" level="ui">
           <component name="mrcommon" filter="s60" long-name="MR Common" introduced="^2">

--- a/symbian3/app/commonemail/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/app/commonemail/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -66,9 +66,6 @@
       <component id="contactactionmenu" filter="s60" name="Contact Action Menu" class="plugin" introduced="^2">
         <unit bldFile="emailcontacts/contactactionmenu/group"/>
       </component>
-      <component id="remotecontactlookup" filter="s60" name="Remote Contact Lookup" class="plugin" introduced="^2">
-        <unit bldFile="emailcontacts/remotecontactlookup/group"/>
-      </component>
     </collection>
     <collection id="meetingrequest" name="Meeting Request" level="ui">
       <component id="mrcommon" filter="s60" name="MR Common" introduced="^2">

--- a/symbian3/app/photos/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/app/photos/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -130,12 +130,6 @@
           <component name="slideshow" filter="s60" long-name="Slideshow" introduced="^2">
             <unit bldFile="/sf/app/photos/photosgallery/slideshow/group"/>
           </component>
-          <component name="contentharvesterplugin" filter="s60" long-name="Gallery Content Harvester Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/app/photos/photosgallery/contentharvesterplugin/group"/>
-          </component>
-          <component name="photossuite" filter="s60" long-name="Photos Suite" introduced="^2" class="config">
-            <unit bldFile="/sf/app/photos/photosgallery/photossuite/group"/>
-          </component>
           <component name="memoryplugin" long-name="Memory Plugin" filter="s60" introduced="^2" plugin="Y">
             <unit bldFile="/sf/app/photos/photosgallery/memoryplugin/group"/>
           </component>

--- a/symbian3/app/photos/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/app/photos/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -54,12 +54,6 @@
    <component id="slideshow" filter="s60" name="Slideshow" introduced="^2">
     <unit bldFile="photosgallery/slideshow/group"/>
    </component>
-   <component id="contentharvesterplugin" filter="s60" name="Gallery Content Harvester Plugin" class="plugin" introduced="^2">
-    <unit bldFile="photosgallery/contentharvesterplugin/group"/>
-   </component>
-   <component id="photossuite" filter="s60" name="Photos Suite" class="config" introduced="^2">
-    <unit bldFile="photosgallery/photossuite/group"/>
-   </component>
    <component id="memoryplugin" name="Memory Plugin" class="plugin" filter="s60" introduced="^2">
     <unit bldFile="photosgallery/memoryplugin/group"/>
    </component>

--- a/symbian3/app/videoplayer/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/app/videoplayer/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -182,17 +182,6 @@
             <unit bldFile="/sf/app/videoplayer/tsrc/VCXTestMyVideosCollectionClient/group"/>
           </component>
         </collection>
-        <collection name="videoplayer_homescreenplugins" long-name="Videoplayer Homescreen Plugins" level="plugin">
-          <component name="videosuiteconf" filter="s60" long-name="Video Suite Configuration" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/app/videoplayer/homescreenplugins/videosuiteconf/group"/>
-          </component>
-          <component name="videoahlplugin" filter="s60" long-name="Video Player Action Handler" introduced="^3" plugin="Y">
-            <unit bldFile="/sf/app/videoplayer/homescreenplugins/videoahlplugin/group"/>
-          </component>
-          <component name="videochplugin" filter="s60" long-name="Video Player Content Harvester " introduced="^3" plugin="Y">
-            <unit bldFile="/sf/app/videoplayer/homescreenplugins/videochplugin/group"/>
-          </component>
-        </collection>
         <collection name="mediasettings" long-name="Media Settings" level="support">
           <!--  this is really a component. Should be moved down a directory -->
           <component name="mediasettings_build" filter="s60" long-name="Media Settings Build">
@@ -223,9 +212,6 @@
             <unit bldFile="/sf/app/videoplayer/videoplayerapp/mpxvideoplayer/group" filter="!test"/>
             <unit bldFile="/sf/app/videoplayer/videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/group" filter="test,unit_test"/>
           </component>
-          <component name="videoplayerlauncher" filter="s60" long-name="Video Player Launcher">
-            <unit bldFile="/sf/app/videoplayer/videoplayerapp/videoplayerlauncher/group"/>
-          </component>
         </collection>
         <collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
           <component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">

--- a/symbian3/app/videoplayer/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/app/videoplayer/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -107,17 +107,6 @@
     <unit bldFile="tsrc/VCXTestMyVideosCollectionClient/group"/>
    </component>
   </collection>
-  <collection id="videoplayer_homescreenplugins" name="Videoplayer Homescreen Plugins" level="plugin">
-   <component id="videosuiteconf" filter="s60" name="Video Suite Configuration" class="plugin" introduced="^3">
-    <unit bldFile="homescreenplugins/videosuiteconf/group"/>
-   </component>
-   <component id="videoahlplugin" filter="s60" name="Video Player Action Handler" class="plugin" introduced="^3">
-    <unit bldFile="homescreenplugins/videoahlplugin/group"/>
-   </component>
-   <component id="videochplugin" filter="s60" name="Video Player Content Harvester " class="plugin" introduced="^3">
-    <unit bldFile="homescreenplugins/videochplugin/group"/>
-   </component>
-  </collection>
   <collection id="mediasettings" name="Media Settings" level="support">
    <!--  this is really a component. Should be moved down a directory -->
    <component id="mediasettings_build" filter="s60" name="Media Settings Build">
@@ -148,9 +137,6 @@
     <unit bldFile="videoplayerapp/mpxvideoplayer/group" filter="!test"/>
     <unit bldFile="videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/group"  filter="test,unit_test"/>
    </component>
-   <component id="videoplayerlauncher" filter="s60" name="Video Player Launcher">
-    <unit bldFile="videoplayerapp/videoplayerlauncher/group"/>
-   </component>
   </collection>
   <collection id="videoplayback" name="Video Playback Plugins" level="plugin">
    <component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">

--- a/symbian3/mw/homescreensrv/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/mw/homescreensrv/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -141,9 +141,6 @@
           <component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
           </component>
-          <component name="context_utility_api" long-name="UI Context Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/context_utility_api/group"/>
-          </component>
           <component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
           </component>
@@ -238,12 +235,6 @@
             <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/group"/>
           </component>
         </collection>
-        <collection name="contextutility" long-name="Context Utility" level="generic">
-          <!-- collection is really a component, needs to be moved down a directory -->
-          <component name="contextutility_build" long-name="Context Utility Build" filter="s60" introduced="^3">
-            <unit bldFile="/sf/mw/homescreensrv/contextutility/group"/>
-          </component>
-        </collection>
         <collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
           <component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
             <unit bldFile="/sf/mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>

--- a/symbian3/mw/homescreensrv/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/mw/homescreensrv/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -82,10 +82,6 @@
     <meta rel="Api" href="homescreensrv_plat/hs_widget_publisher_api/hs_widget_publisher_api.metaxml"/>
     <unit bldFile="homescreensrv_plat/hs_widget_publisher_api/group"/>
    </component>
-   <component id="context_utility_api" name="UI Context Utility API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/context_utility_api/ui_context_utility_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/context_utility_api/group"/>
-   </component>
    <component id="hs_settings_api" name="HS Settings API" class="api" filter="s60">
     <unit bldFile="homescreensrv_plat/hs_settings_api/group"/>
    </component>
@@ -189,12 +185,6 @@
     <unit bldFile="contentpublishingsrv/group"/>
    </component>
   </collection>
-  <collection id="contextutility" name="Context Utility" level="generic">
-   <!-- collection is really a component, needs to be moved down a directory -->
-   <component id="contextutility_build" name="Context Utility Build" filter="s60" introduced="^3">
-    <unit bldFile="contextutility/group"/>
-   </component>
-  </collection>
   <collection id="contentcontrolsrv" name="Content Control Service" level="server">
    <component id="ccsrv" name="Content Control Service" filter="s60" introduced="^3">
     <unit bldFile="contentcontrolsrv/ccsrv/group"/>

--- a/symbian3/mw/inputmethods/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/mw/inputmethods/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -128,12 +128,6 @@
           <component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
             <unit bldFile="/sf/mw/inputmethods/textinput/akninputlanguage/group"/>
           </component>
-          <component name="ptihangulcore" filter="s60" long-name="PIT Hangul Core" introduced="^3">
-            <unit bldFile="/sf/mw/inputmethods/textinput/ptihangulcore/group"/>
-          </component>
-          <component name="ptikoreanqwertycore" filter="s60" long-name="PTI Korean QWERTY Core" introduced="^3">
-            <unit bldFile="/sf/mw/inputmethods/textinput/ptikoreanqwertycore/group"/>
-          </component>
           <component name="peninputarc" filter="s60" long-name="Pen Input Arc">
             <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/group"/>
           </component>

--- a/symbian3/mw/inputmethods/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/mw/inputmethods/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -76,12 +76,6 @@
    <component id="akninputlanguage" filter="s60" name="Avkon Input Language">
     <unit bldFile="textinput/akninputlanguage/group"/>
    </component>
-   <component id="ptihangulcore" filter="s60" name="PIT Hangul Core" introduced="^3">
-    <unit bldFile="textinput/ptihangulcore/group"/>
-   </component>
-   <component id="ptikoreanqwertycore" filter="s60" name="PTI Korean QWERTY Core" introduced="^3">
-    <unit bldFile="textinput/ptikoreanqwertycore/group"/>
-   </component>
    <component id="peninputarc" filter="s60" name="Pen Input Arc">
     <unit bldFile="textinput/peninputarc/group"/>
    </component>

--- a/symbian3/mw/shortlinkconn/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/mw/shortlinkconn/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -120,18 +120,9 @@
           <component name="dun" long-name="Dial Up Networking">
             <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/dun/group"/>
           </component>
-          <component name="lccustomplugin" long-name="LC Custom Plugins" plugin="Y">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lccustomplugin/group"/>
-          </component>
           <component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
             <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
           </component>
-          <component name="legacymodemplugin" long-name="Legacy Modem Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/legacymodemplugin/group"/>
-          </component>
-          <component name="modematplugin" long-name="Modem AT Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/modematplugin/group"/>
-          </component>
           <component name="generichid" long-name="Generic HID">
             <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
           </component>

--- a/symbian3/mw/shortlinkconn/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/mw/shortlinkconn/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -49,18 +49,9 @@
    <component id="dun" name="Dial Up Networking">
     <unit bldFile="localconnectivityservice/dun/group"/>
    </component>
-   <component id="lccustomplugin" name="LC Custom Plugins" class="plugin">
-    <unit bldFile="localconnectivityservice/lccustomplugin/group"/>
-   </component>
    <component id="lcstylustap" name="LC Stylus Tap Plugins" class="plugin">
     <unit bldFile="localconnectivityservice/lcstylustap/group"/>
    </component>
-   <component id="legacymodemplugin" name="Legacy Modem Plugin" class="plugin">
-    <unit bldFile="localconnectivityservice/legacymodemplugin/group"/>
-   </component>
-   <component id="modematplugin" name="Modem AT Plugin" class="plugin">
-    <unit bldFile="localconnectivityservice/modematplugin/group"/>
-   </component>
    <component id="generichid" name="Generic HID">
     <unit bldFile="localconnectivityservice/generichid/group"/>
    </component>

--- a/symbian3/os/lbs/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -139,20 +139,10 @@
           <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
             <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
           </component>
-          <component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-          </component>
-          <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
-          </component>
           <component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
             <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
             <unit bldFile="/sf/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
           </component>
-          <component name="suplrrlpprotocol" filter="sf_build" long-name="SUPL RRLP Protocol Module">
-            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
-          </component>
         </collection>
         <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
           <component name="lbshaitest" long-name="Location HAI Tests" introduced="^2" purpose="development" filter="test">

--- a/symbian3/os/lbs/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian3/os/lbs/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -63,20 +63,10 @@
       <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
       </component>
-      <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-      </component>
-      <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
-        <unit bldFile="networkprotocolmodules/suplprotocolmodule/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
-      </component>
       <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
         <unit bldFile="networkprotocolmodules/common/suplrrlpasn1/group"/>
       </component>
-      <component id="suplrrlpprotocol" filter="sf_build" name="SUPL RRLP Protocol Module">
-        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
-      </component>
     </collection>
     <collection id="lbsapitest" name="Location API Tests" level="application-interface">
       <component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">

--- a/symbian4/mw/homescreensrv/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -141,9 +141,6 @@
           <component name="hs_widget_publisher_api" long-name="Home Screen Publishing API" filter="s60" class="api">
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/hs_widget_publisher_api/group"/>
           </component>
-          <component name="context_utility_api" long-name="UI Context Utility API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/context_utility_api/group"/>
-          </component>
           <component name="hs_settings_api" long-name="HS Settings API" filter="s60" class="api">
             <unit bldFile="/sf/mw/homescreensrv/homescreensrv_plat/hs_settings_api/group"/>
           </component>
@@ -238,12 +235,6 @@
             <unit bldFile="/sf/mw/homescreensrv/contentpublishingsrv/group"/>
           </component>
         </collection>
-        <collection name="contextutility" long-name="Context Utility" level="generic">
-          <!-- collection is really a component, needs to be moved down a directory -->
-          <component name="contextutility_build" long-name="Context Utility Build" filter="s60" introduced="^3">
-            <unit bldFile="/sf/mw/homescreensrv/contextutility/group"/>
-          </component>
-        </collection>
         <collection name="contentcontrolsrv" long-name="Content Control Service" level="server">
           <component name="ccsrv" long-name="Content Control Service" filter="s60" introduced="^3">
             <unit bldFile="/sf/mw/homescreensrv/contentcontrolsrv/ccsrv/group"/>

--- a/symbian4/mw/homescreensrv/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -82,10 +82,6 @@
     <meta rel="Api" href="homescreensrv_plat/hs_widget_publisher_api/hs_widget_publisher_api.metaxml"/>
     <unit bldFile="homescreensrv_plat/hs_widget_publisher_api/group"/>
    </component>
-   <component id="context_utility_api" name="UI Context Utility API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/context_utility_api/ui_context_utility_api.metaxml"/>
-    <unit bldFile="homescreensrv_plat/context_utility_api/group"/>
-   </component>
    <component id="hs_settings_api" name="HS Settings API" class="api" filter="s60">
     <unit bldFile="homescreensrv_plat/hs_settings_api/group"/>
    </component>
@@ -189,12 +185,6 @@
     <unit bldFile="contentpublishingsrv/group"/>
    </component>
   </collection>
-  <collection id="contextutility" name="Context Utility" level="generic">
-   <!-- collection is really a component, needs to be moved down a directory -->
-   <component id="contextutility_build" name="Context Utility Build" filter="s60" introduced="^3">
-    <unit bldFile="contextutility/group"/>
-   </component>
-  </collection>
   <collection id="contentcontrolsrv" name="Content Control Service" level="server">
    <component id="ccsrv" name="Content Control Service" filter="s60" introduced="^3">
     <unit bldFile="contentcontrolsrv/ccsrv/group"/>

--- a/symbian4/mw/inputmethods/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian4/mw/inputmethods/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -128,12 +128,6 @@
           <component name="akninputlanguage" filter="s60" long-name="Avkon Input Language">
             <unit bldFile="/sf/mw/inputmethods/textinput/akninputlanguage/group"/>
           </component>
-          <component name="ptihangulcore" filter="s60" long-name="PIT Hangul Core" introduced="^3">
-            <unit bldFile="/sf/mw/inputmethods/textinput/ptihangulcore/group"/>
-          </component>
-          <component name="ptikoreanqwertycore" filter="s60" long-name="PTI Korean QWERTY Core" introduced="^3">
-            <unit bldFile="/sf/mw/inputmethods/textinput/ptikoreanqwertycore/group"/>
-          </component>
           <component name="peninputarc" filter="s60" long-name="Pen Input Arc">
             <unit bldFile="/sf/mw/inputmethods/textinput/peninputarc/group"/>
           </component>

--- a/symbian4/mw/inputmethods/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian4/mw/inputmethods/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -76,12 +76,6 @@
    <component id="akninputlanguage" filter="s60" name="Avkon Input Language">
     <unit bldFile="textinput/akninputlanguage/group"/>
    </component>
-   <component id="ptihangulcore" filter="s60" name="PIT Hangul Core" introduced="^3">
-    <unit bldFile="textinput/ptihangulcore/group"/>
-   </component>
-   <component id="ptikoreanqwertycore" filter="s60" name="PTI Korean QWERTY Core" introduced="^3">
-    <unit bldFile="textinput/ptikoreanqwertycore/group"/>
-   </component>
    <component id="peninputarc" filter="s60" name="Pen Input Arc">
     <unit bldFile="textinput/peninputarc/group"/>
    </component>

--- a/symbian4/os/lbs/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian4/os/lbs/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -139,20 +139,10 @@
           <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
             <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
           </component>
-          <component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-          </component>
-          <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
-            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
-          </component>
           <component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
             <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
             <unit bldFile="/sf/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
           </component>
-          <component name="suplrrlpprotocol" filter="sf_build" long-name="SUPL RRLP Protocol Module">
-            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
-          </component>
         </collection>
         <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
           <component name="lbshaitest" long-name="Location HAI Tests" introduced="^2" purpose="development" filter="test">

--- a/symbian4/os/lbs/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
+++ b/symbian4/os/lbs/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
@@ -63,20 +63,10 @@
       <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
         <unit bldFile="networkprotocolmodules/privacyprotocolmodule/group" mrp="networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
       </component>
-      <component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
-        <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
-      </component>
-      <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
-        <unit bldFile="networkprotocolmodules/suplprotocolmodule/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
-      </component>
       <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
         <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
         <unit bldFile="networkprotocolmodules/common/suplrrlpasn1/group"/>
       </component>
-      <component id="suplrrlpprotocol" filter="sf_build" name="SUPL RRLP Protocol Module">
-        <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
-        <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
-      </component>
     </collection>
     <collection id="lbsapitest" name="Location API Tests" level="application-interface">
       <component id="lbshaitest" name="Location HAI Tests" introduced="^2" purpose="development" filter="test">