--- a/symbian3/os/networkingsrv/package_definition.xml	Tue Oct 26 17:20:44 2010 +0100
+++ b/symbian3/os/networkingsrv/package_definition.xml	Wed Oct 27 14:21:55 2010 +0100
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="networkingsrv" name="Networking Services" levels="adapt hw-if plugin framework server app-if">
-    <collection id="commsdb" name="Comms DB" level="server">
-      <component id="s60_commsdb" filter="s60" name="S60 Commsdb" class="config">
-        <unit bldFile="commsdb/s60_commsdb/group"/>
-      </component>
-    </collection>
     <collection id="esockapiextensions" name="ESock API Extensions" level="app-if">
       <component id="internetsockets" name="Internet Sockets" introduced="ER5" purpose="mandatory">
         <unit bldFile="esockapiextensions/internetsockets/group" mrp="esockapiextensions/internetsockets/group/networking_insock.mrp"/>
@@ -27,9 +22,6 @@
       <component id="punycodeconv" name="Punycode Converter" introduced="^3" purpose="mandatory">
         <unit bldFile="tcpiputils/punycodeconv/group" mrp="tcpiputils/punycodeconv/group/networking_punycodeconverter.mrp"/>
       </component>
-      <component id="tun" name="Tun Hook" introduced="^3" purpose="mandatory">
-        <unit bldFile="tcpiputils/tun/group" mrp="tcpiputils/tun/group/networking_tun.mrp"/>
-      </component>
     </collection>
     <collection id="linklayercontrol" name="Link Layer Control" level="hw-if">
       <component id="nullagt" name="NULL AGT" introduced="7.0s" purpose="optional" class="plugin">
@@ -44,9 +36,6 @@
       <component id="networkinterfacemgr" name="Network Interface Manager" introduced="ER5U" purpose="mandatory">
         <unit version="2" bldFile="linklayercontrol/networkinterfacemgr/group" mrp="linklayercontrol/networkinterfacemgr/group/comms-infras_nifman.mrp"/>
       </component>
-      <component id="tundriveragt" name="Tun Driver Agent" introduced="^3" purpose="mandatory" class="plugin">
-        <unit bldFile="linklayercontrol/tundriveragt/group" mrp="linklayercontrol/tundriveragt/group/networking_tundriveragt.mrp"/>
-      </component>
     </collection>
     <collection id="linklayerprotocols" name="Link Layer Protocols" level="hw-if">
       <component id="ethernetnif" name="Ethernet NIF" purpose="optional" class="plugin">
@@ -67,9 +56,6 @@
       <component id="tunnelnif" name="Tunnel NIF" introduced="7.0s" purpose="optional" class="plugin">
         <unit bldFile="linklayerprotocols/tunnelnif/group" mrp="linklayerprotocols/tunnelnif/group/networking_tunnelnif.mrp"/>
       </component>
-      <component id="tundriver" name="Tun Driver" introduced="^3" purpose="mandatory" class="plugin">
-        <unit bldFile="linklayerprotocols/tundriver/group" mrp="linklayerprotocols/tundriver/group/networking_tundriver.mrp"/>
-      </component>
     </collection>
     <collection id="linklayerutils" name="Link Layer Utilities" level="hw-if">
       <component id="packetlogger" name="Packet Logger" introduced="8.1" purpose="development">