diff -r 5149853062ae -r 7975a56cd8c7 symbian4/app/phone/package_definition.xml
--- a/symbian4/app/phone/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="app" long-name="Applications" levels="services apps">
    <block name="phone" level="apps" span="2" long-name="Phone Apps" levels="engine plugin ui app">
@@ -58,11 +58,6 @@
 <component name="blacklist" filter="s60" long-name="Phone Blacklist Clearing" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneapp/blacklist/group"/>
 </component>
-
-<component name="phoneringingtoneplayer" filter="s60" long-name="Phone Rining Tone Player">
-<unit bldFile="/sf/app/phone/phoneapp/phoneringingtoneplayer/group"/>
-</component>
-
 <component name="phoneuicontrol" filter="s60" long-name="Phone UI Control">
 <unit bldFile="/sf/app/phone/phoneapp/phoneuicontrol/group"/>
 </component>
@@ -144,11 +139,6 @@
 <component name="telephony_device_mode_api" long-name="Telephony Device Mode API" filter="s60" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_device_mode_api/group"/>
 </component>
-
-<component name="telephony_menu_extension_api" long-name="Telephony Menu Extension API" filter="s60" class="api">
-<unit bldFile="/sf/app/phone/phone_plat/telephony_menu_extension_api/group"/>
-</component>
-
 <component name="telephony_remote_party_information_api" long-name="Telephony Remote Party Information API" filter="s60" class="api">
 <unit bldFile="/sf/app/phone/phone_plat/telephony_remote_party_information_api/group"/>
 </component>
@@ -184,9 +174,6 @@
 <component name="csplugin" filter="s60" long-name="Circuit Switched Plugin" introduced="^4" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneplugins/csplugin/group"/>
 </component>
-<component name="phoneindicatorplugin" filter="s60" long-name="Info Indicator Plugin" introduced="^4" plugin="Y">
-<unit bldFile="/sf/app/phone/phoneplugins/phoneindicatorplugin" proFile="phoneindicatorplugin.pro"/>
-</component>
 <component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
 <unit bldFile="/sf/app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
 </component>