diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java
index 4b0a91cc91a..223fbbd1893 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugModel.java
@@ -23,7 +23,6 @@ import org.eclipse.cdt.debug.internal.core.breakpoints.CLineBreakpoint;
 import org.eclipse.cdt.debug.internal.core.breakpoints.CWatchpoint;
 import org.eclipse.cdt.debug.internal.core.model.CDebugTarget;
 import org.eclipse.cdt.debug.internal.core.model.CExpression;
-import org.eclipse.cdt.debug.internal.core.model.CThread;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -33,7 +32,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugEvent;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.IBreakpointManager;
@@ -42,7 +40,6 @@ import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IExpression;
 import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IThread;
 
 /**
  * 
@@ -145,7 +142,6 @@ public class CDebugModel
 	public static IDebugTarget newAttachDebugTarget( final ILaunch launch,
 													 final ICDITarget cdiTarget,
 													 final String name,
-													 final IProcess process,
 													 final IProject project ) throws DebugException
 	{
 		final IDebugTarget[] target = new IDebugTarget[1];
@@ -158,7 +154,7 @@ public class CDebugModel
 											  ICDebugTargetType.TARGET_TYPE_LOCAL_ATTACH, 
 											  cdiTarget, 
 											  name,
-											  process,
+											  null,
 											  project,
 											  false,
 											  true );
@@ -174,8 +170,6 @@ public class CDebugModel
 			throw new DebugException( e.getStatus() );
 		}
 
-		ICDIConfiguration config = cdiTarget.getSession().getConfiguration();
-
 		((CDebugTarget)target[0]).handleDebugEvent( new ICDISuspendedEvent()
 														{
 															public ICDISessionObject getReason()
@@ -196,7 +190,6 @@ public class CDebugModel
 	public static IDebugTarget newCoreFileDebugTarget( final ILaunch launch,
 													   final ICDITarget cdiTarget,
 													   final String name,
-													   final IProcess process,
 													   final IProject project ) throws DebugException
 	{
 		final IDebugTarget[] target = new IDebugTarget[1];
@@ -209,7 +202,7 @@ public class CDebugModel
 											  ICDebugTargetType.TARGET_TYPE_LOCAL_CORE_DUMP, 
 											  cdiTarget, 
 											  name,
-											  process,
+											  null,
 											  project,
 											  true,
 											  false );
@@ -225,8 +218,6 @@ public class CDebugModel
 			throw new DebugException( e.getStatus() );
 		}
 
-		ICDIConfiguration config = cdiTarget.getSession().getConfiguration();
-
 		((CDebugTarget)target[0]).handleDebugEvent( new ICDISuspendedEvent()
 														{
 															public ICDISessionObject getReason()
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
index 1bcbaaafc3d..9da7d300295 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/CoreFileLaunchDelegate.java
@@ -18,10 +18,8 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Shell;
@@ -67,7 +65,6 @@ public class CoreFileLaunchDelegate extends AbstractCLaunchDelegate {
 			launch,
 			dsession.getCurrentTarget(),
 			renderTargetLabel(debugConfig),
-			null,
 			exe.getProject());
 	}
 
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
index 5f2e7df722a..c5ed65d1275 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java
@@ -107,7 +107,6 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate {
 						launch,
 						dsession.getCurrentTarget(),
 						renderTargetLabel(debugConfig),
-						null,
 						exe.getProject());
 				}
 			} catch (CDIException e) {