diff -r 599e410f8b66 -r aeb961de6cf3 symbian4/single/sysdefs/system_model.xml
--- a/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 13:42:00 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 14:20:17 2010 +0100
@@ -3247,63 +3247,27 @@
 </component>
 </collection>
 <collection name="locsrv_plat" long-name="Location Services Platform Interfaces" level="if">
-<component name="map_and_navigation_api" long-name="Map and Navigation API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_api/group"/>
-</component>
-<component name="map_and_navigation_provider_discovery_api" long-name="Map and Navigation Provider Discovery API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_discovery_api/group"/>
-</component>
 <component name="geocoding_api" long-name="Geocoding API" filter="s60" class="api">
 <unit bldFile="mw/locationsrv/locsrv_plat/geocoding_api/group"/>
 </component>
-<component name="map_image_api" long-name="Map Image API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_api/group"/>
-</component>
-<component name="map_and_navigation_aiw_api" long-name="Map and Navigation AIW API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_aiw_api/group"/>
-</component>
-<component name="map_and_navigation_provider_api" long-name="Map and Navigation Provider API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_and_navigation_provider_api/group"/>
-</component>
 <component name="landmarks_category_definition_api" long-name="Landmarks Category Definition API" filter="s60" class="api">
 <unit bldFile="mw/locationsrv/locsrv_plat/landmarks_category_definition_api/group"/>
 </component>
 <component name="supl_settings_api" long-name="SUPL Settings API" filter="s60" class="api">
 <unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_api/group"/>
 </component>
-<component name="location_settings_launch_api" long-name="Location Settings Launch API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_settings_launch_api/group"/>
-</component>
-<component name="map_image_conversion_plugin_api" long-name="Map Image Conversion Plug-In API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/map_image_conversion_plugin_api/group"/>
-</component>
-<component name="psy_configuration_ui_plugin_api" long-name="PSY Configuration UI Plug-in API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/psy_configuration_ui_plugin_api/group"/>
-</component>
 <component name="np_proxy_configuration_api" long-name="NP Proxy Configuration API" filter="s60" class="api">
 <unit bldFile="mw/locationsrv/locsrv_plat/np_proxy_configuration_api/group"/>
 </component>
 <component name="supl_terminal_initiation_api" long-name="SUPL Terminal Initiation API" filter="s60" class="api">
 <unit bldFile="mw/locationsrv/locsrv_plat/supl_terminal_initiation_api/group"/>
 </component>
-<component name="location_notation_preferences_settings_api" long-name="Location Notation Preferences Settings API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/location_notation_preferences_settings_api/group"/>
-</component>
-<component name="supl_settings_notifier_secondary_display_api" long-name="SUPL Settings Notifier Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_settings_notifier_secondary_display_api/group"/>
-</component>
 <component name="supl_network_initiation_api" long-name="SUPL Network Initiation API" filter="s60" class="api">
 <unit bldFile="mw/locationsrv/locsrv_plat/supl_network_initiation_api/group"/>
 </component>
-<component name="privacy_notifiers_secondary_display_api" long-name="Privacy Notifiers Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/privacy_notifiers_secondary_display_api/group"/>
-</component>
 <component name="oma_supl_configuration_parameter_api" long-name="OMA SUPL Configuration Parameter API" filter="s60" class="api">
 <unit bldFile="mw/locationsrv/locsrv_plat/oma_supl_configuration_parameter_api/group"/>
 </component>
-<component name="supl_query_secondary_display_api" long-name="SUPL Query Secondary Display API" filter="s60" class="api">
-<unit bldFile="mw/locationsrv/locsrv_plat/supl_query_secondary_display_api/group"/>
-</component>
 <component name="location_triggering_management_api" long-name="Location Triggering Management API" filter="s60" class="api">
 <unit bldFile="mw/locationsrv/locsrv_plat/location_triggering_management_api/group"/>
 </component>
@@ -3337,18 +3301,6 @@
 <unit bldFile="mw/locationsrv/landmarks/locationlandmarks/group"/>
 </component>
 </collection>
-<collection name="locationmapnavfw" long-name="Location Map and Navigation Framework" level="fw">
-<component name="mnlibrary" filter="s60" long-name="Map and Navigation Library">
-<unit bldFile="mw/locationsrv/locationmapnavfw/library/group"/>
-</component>
-<component name="mnaiwprovider" filter="s60" long-name="Map and Navigation AIW Provider" plugin="Y">
-<unit bldFile="mw/locationsrv/locationmapnavfw/aiwprovider/group"/>
-</component>
-<component name="locationmapnavfw_build" filter="s60" long-name="Location Map and Navigation Framework Build">
-<!-- need to break this up into the other components -->
-<unit bldFile="mw/locationsrv/locationmapnavfw/group"/>
-</component>
-</collection>
 <collection name="locationsystemui" long-name="Location System UI" level="if">
 <component name="locationsysui" filter="s60" long-name="Location System UI">
 <unit bldFile="mw/locationsrv/locationsystemui/locationsysui/group"/>
@@ -3393,9 +3345,6 @@
 <component name="ltcellidmovementdetector" filter="s60" long-name="Cell ID Movement Detector">
 <unit bldFile="mw/locationsrv/locationtriggering/ltcellidmovementdetector/group"/>
 </component>
-<component name="lbtmgmtui" filter="s60" long-name="LBT Management UI" plugin="Y">
-<unit bldFile="mw/locationsrv/locationtriggering/lbtmgmtui/group"/>
-</component>
 <component name="ltcontextsourceplugin" filter="s60" long-name="LT Context Source Plugin" introduced="^3" plugin="Y">
 <unit bldFile="mw/locationsrv/locationtriggering/ltcontextsourceplugin/group"/>
 </component>