--- a/debuggercdi/com.nokia.carbide.trk.support/META-INF/MANIFEST.MF	Thu Aug 05 14:41:19 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/META-INF/MANIFEST.MF	Thu Aug 05 15:31:11 2010 -0500
@@ -19,5 +19,5 @@
  lib/commons-codec-1.3.jar,
  lib/commons-logging-1.1.jar
 Export-Package: com.nokia.carbide.trk.support.connection;x-friends:="com.nokia.carbide.symsee.trk.support,com.nokia.carbide.cpp.edc",
- com.nokia.carbide.trk.support.service;x-friends:="com.nokia.carbide.symsee.trk.support,com.nokia.cdt.debug.launch.platSim,com.nokia.carbide.cpp.edc"
+ com.nokia.carbide.trk.support.service;x-friends:="com.nokia.carbide.symsee.trk.support,com.nokia.carbide.cpp.edc"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF	Thu Aug 05 14:41:19 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF	Thu Aug 05 15:31:11 2010 -0500
@@ -33,9 +33,7 @@
   x-friends:="com.nokia.carbide.automation.smoke.test,
    com.nokia.carbide.automation.utils,
    com.nokia.cdt.debug.cw.symbian.tests,
-   com.nokia.cdt.debug.launch,
-   com.nokia.cdt.debug.launch.platSim,
-   com.nokia.cdt.debug.launch.platSim.stopMode",
+   com.nokia.cdt.debug.launch",
  com.nokia.cdt.debug.cw.symbian.binaryparser;
   x-friends:="com.nokia.carbide.automation.smoke.test,
    com.nokia.carbide.automation.utils,

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java	Thu Aug 05 14:41:19 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java	Thu Aug 05 15:31:11 2010 -0500
@@ -102,7 +102,6 @@
 	
 	public static final String REMOTE_CONNECTIONS_TRK_SERVICE = "com.nokia.carbide.trk.support.service.TRKService"; //$NON-NLS-1$
 	public static final String REMOTE_CONNECTIONS_TRACING_SERVICE = "com.nokia.carbide.trk.support.service.TracingService"; //$NON-NLS-1$
-	public static final String REMOTE_CONNECTIONS_PLATSIM_SERVICE = "com.nokia.cdt.internal.debug.launch.platSim.service.PlatSimService"; //$NON-NLS-1$
 
 	// Preference constants
 	public static final String Use_New_Project_Assist = "com.nokia.cdt.debug.launch.Use_New_Project_Assist"; //$NON-NLS-1$
@@ -603,11 +602,6 @@
 					findServiceByID(REMOTE_CONNECTIONS_TRK_SERVICE);
 	}
 	
-	public static IService getPlatSimService() {
-		return RemoteConnectionsActivator.getConnectionTypeProvider().
-					findServiceByID(REMOTE_CONNECTIONS_PLATSIM_SERVICE);
-	}
-	
 	/**
 	 * Returns the currently active workbench window or <code>null</code>
 	 * if none.

--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java	Thu Aug 05 14:41:19 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java	Thu Aug 05 15:31:11 2010 -0500
@@ -93,8 +93,6 @@
 	public final static LaunchType APP_TRK = new LaunchType(null);
 	public final static LaunchType SYS_TRK = new LaunchType(null);
 	public final static LaunchType ATTACH_TO_PROCESS_LAUNCH = new LaunchType(null);
-	public final static LaunchType PLATSIM_RUN_MODE = new LaunchType(null);
-	public final static LaunchType PLATSIM_STOP_MODE = new LaunchType(null);
 	
 	// settings made in Debug/Run Process section
 	enum EExeSelection {