--- a/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml	Tue Jan 26 13:41:56 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml	Tue Jan 26 14:07:50 2010 -0600
@@ -60,17 +60,6 @@
             sourcePathComputerId="com.nokia.cdt.debug.cw.symbian.CarbideSourcePathComputer">
       </launchDelegate>
       
-      <launchDelegate
-            name="Classic Symbian OS Sophia"
-            delegate="com.nokia.cdt.internal.debug.launch.SophiaSTILaunchDelegate"
-            delegateDescription="Launch a classic Symbian OS Trace32 debug session."          
-            modes="debug"
-            type="com.nokia.cdt.debug.launch.stiLaunch"
-            id="com.nokia.cdt.debug.launch.stiLaunchDelegate"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="com.nokia.cdt.debug.cw.symbian.CarbideSourcePathComputer">
-      </launchDelegate>
-  
    </extension>
 
    <extension
@@ -106,12 +95,6 @@
             id="com.nokia.cdt.debug.launch.t32Launch">
       </launchConfigurationType>
       
-      <launchConfigurationType
-            name="Symbian OS Sophia"
-            public="true"
-            id="com.nokia.cdt.debug.launch.stiLaunch">
-      </launchConfigurationType>
-  
    </extension>
    
   <extension
@@ -142,12 +125,6 @@
             configTypeID="com.nokia.cdt.debug.launch.t32Launch"
             id="com.nokia.cdt.debug.launch.t32LaunchImage">
       </launchConfigurationTypeImage>
-      
-      <launchConfigurationTypeImage
-            icon="icons/launch_config_file_16x16.png"
-            configTypeID="com.nokia.cdt.debug.launch.stiLaunch"
-            id="com.nokia.cdt.debug.launch.stiLaunchImage">
-      </launchConfigurationTypeImage>
     </extension>
 
    <extension
@@ -196,16 +173,6 @@
     </extension>
     
     <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="com.nokia.cdt.debug.launch.stiLaunch"
-            class="com.nokia.cdt.internal.debug.launch.ui.SophiaConfigurationTabGroup"
-            id="com.nokia.cdt.debug.launch.SophiaLaunchTabGroup">
-      </launchConfigurationTabGroup>
-    </extension>
-
- 
-    <extension
          point="org.eclipse.debug.ui.launchShortcuts">
       <shortcut
             label="Symbian OS Application"