--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java	Wed Aug 04 16:39:47 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java	Thu Aug 05 11:54:21 2010 -0500
@@ -16,7 +16,6 @@
 */
 package com.nokia.carbide.cdt.internal.builder;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -43,8 +42,6 @@
 import com.nokia.carbide.cdt.builder.project.IEnvironmentVarsInfo;
 import com.nokia.carbide.cdt.builder.project.ISISBuilderInfo;
 import com.nokia.carbide.cdt.internal.api.builder.SISBuilderInfo2;
-import com.nokia.carbide.cpp.epoc.engine.preprocessor.IDefine;
-import com.nokia.carbide.cpp.internal.api.sdk.BuildArgumentsInfo;
 import com.nokia.carbide.cpp.internal.api.sdk.BuildContextSBSv1;
 import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildContext;
 import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildInfo;
@@ -145,7 +142,7 @@
 			ICProjectDescription projDes = CoreModel.getDefault().getProjectDescription(projectTracker.getProject());
 			if (projDes != null) {
 			
-				ICConfigurationDescription configDes = projDes.getConfigurationById(getConfigurationID());
+				ICConfigurationDescription configDes = projDes.getConfigurationById(getBuildContext().getConfigurationID());
 				if (configDes != null) {
 					// save the CDT project description.  this saves all configs but that's the
 					// only thing CDT allows at this point.
@@ -160,18 +157,6 @@
 
 		return false;
 	}
-	
-	/**
-	 * Get the unique ID for this build configuration.
-	 * For ABLD it is the display name, for SBSv2, it is the builder ID
-	 * @return
-	 */
-	public String getConfigurationID() {
-		if (context instanceof ISBSv2BuildContext){
-			return ((ISBSv2BuildContext) context).getConfigID();
-		}
-		return context.getDisplayString();
-	}
 
 	public List<ISISBuilderInfo> getSISBuilderInfoList() {
 		return sisBuilderInfoList;
@@ -298,26 +283,6 @@
 	public ISymbianBuildContext getBuildContext() {
 		return context;
 	}
-
-	public List<IDefine> getCompilerMacros() {
-		return context.getCompilerMacros();
-	}
-
-	public IPath getCompilerPrefixFile() {
-		return context.getCompilerPrefixFile();
-	}
-
-	public List<IDefine> getVariantHRHDefines() {
-		return context.getVariantHRHDefines();
-	}
-
-	public List<File> getPrefixFileIncludes() {
-		return context.getPrefixFileIncludes();
-	}
-
-	public String getBuildVariationName() {
-		return context.getBuildVariationName();
-	}
 	
 	public boolean hasSTDCPPSupport() {