--- a/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 14:37:29 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Fri Jun 11 14:51:04 2010 +0100
@@ -3356,65 +3356,16 @@
 </block>
 <block name="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
 <collection name="accesssec_plat" long-name="Access Security Platform Interfaces" level="specific">
-<component name="wapi_security_settings_ui_api" long-name="WAPI Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_security_settings_ui_api/group"/>
-</component>
-<component name="wep_security_settings_ui_api" long-name="WEP Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wep_security_settings_ui_api/group"/>
-</component>
-<component name="wi-fi_protected_setup_ui_api" long-name="Wi-Fi Protected Setup UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wi-fi_protected_setup_ui_api/group"/>
-</component>
-<component name="wlan_eap_settings_ui_api" long-name="WLAN EAP Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wlan_eap_settings_ui_api/group"/>
-</component>
-<component name="wpa_security_settings_ui_api" long-name="WPA Security Settings UI API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wpa_security_settings_ui_api/group"/>
-</component>
 <component name="eap_vpn_api" long-name="EAP VPN API" filter="s60" class="api">
 <unit bldFile="mw/accesssec/accesssec_plat/eap_vpn_api/group"/>
 </component>
-<component name="eapsim_db_api" long-name="EAP-SIM DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapsim_db_api/group"/>
-</component>
 <component name="eap_type_api" long-name="EAP Type API" filter="s60" class="api">
 <unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
 </component>
-<component name="eaptlspeap_db_api" long-name="EAP-TLS-PEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eaptlspeap_db_api/group"/>
-</component>
-<component name="eapleap_db_api" long-name="LEAP DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapleap_db_api/group"/>
-</component>
-<component name="eapgtc_db_api" long-name="EAP-GTC DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapgtc_db_api/group"/>
-</component>
-<component name="eapmschapv2_db_api" long-name="EAP-MSCHAPV2 DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapmschapv2_db_api/group"/>
-</component>
-<component name="eapaka_db_api" long-name="EAP-AKA DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/eapaka_db_api/group"/>
-</component>
-<component name="wapi_db_api" long-name="WAPI DB API" filter="s60" class="api">
-<unit bldFile="mw/accesssec/accesssec_plat/wapi_db_api/group"/>
-</component>
-</collection>
-<collection name="wlansecuritysettings" long-name="WLAN Security Settings" level="specific">
-<component name="wapisecuritysettingsui" filter="s60" long-name="WAPI Security Settings UI" introduced="9.1">
-<!-- the directory for this needs to be moved up to the right level -->
-<unit bldFile="mw/accesssec/wlansecuritysettings/wapisecuritysettingsui/stub/group"/>
-</component>
-<component name="wepsecuritysettingsui" filter="s60" long-name="WEP Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wepsecuritysettingsui/group"/>
-</component>
-<component name="wifiprotectedsetup" filter="s60" long-name="WIFI Protected Setup" introduced="^1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wifiprotectedsetup/group"/>
-</component>
-<component name="wlaneapsettingsui" filter="s60" long-name="WLAN EAP Settings UI" introduced="9.3">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wlaneapsettingsui/group"/>
-</component>
-<component name="wpasecuritysettingsui" filter="s60" long-name="WPA Security Settings UI" introduced="9.1">
-<unit bldFile="mw/accesssec/wlansecuritysettings/wpasecuritysettingsui/group"/>
+</collection>
+<collection name="securitysettings" long-name="Security Settings" level="generic">
+<component name="securitysettings_build" long-name="Security Settings Build" introduced="^4">
+<unit bldFile="mw/accesssec/securitysettings" qmakeArgs="-r" proFile="securitysettings.pro"/>
 </component>
 </collection>
 <collection name="eapol" long-name="EAPOL" level="framework">