--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Thu May 07 12:10:50 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Mon May 11 08:24:35 2009 -0500
@@ -41,7 +41,6 @@
 	private String platform;
 	private String target;
 	private String displayString = null;
-	private String symbianBuildVariationString;
 	
 	private static String EMULATOR_DISPLAY_TEXT = "Emulator"; //$NON-NLS-1$
 	private static String PHONE_DISPLAY_TEXT = "Phone"; //$NON-NLS-1$
@@ -63,26 +62,11 @@
 	
 	public SymbianBuildContext(ISymbianSDK theSDK, String thePlatform, String theTarget) {
 		sdkId = theSDK.getUniqueId();
-		String[] platformString = thePlatform.split("\\.");
-		if (platformString != null && platformString.length == 2){
-			platform = platformString[0];
-			symbianBuildVariationString = platformString[1];
-		} else {
-			platform = thePlatform;
-			symbianBuildVariationString = "";
-		}
-		
+		platform = thePlatform;
 		target = theTarget;
 		getDisplayString();
 	}
-	
-	public SymbianBuildContext(ISymbianSDK theSDK, String thePlatform, String theTarget, String theBinaryVariationName) {
-		sdkId = theSDK.getUniqueId();
-		platform = thePlatform;
-		target = theTarget;
-		symbianBuildVariationString = theBinaryVariationName;
-		getDisplayString();
-	}
+
 	
 	@Override
 	public int hashCode() {
@@ -157,13 +141,8 @@
 			} else {
 				displayString = displayString + SPACE_DISPLAY_TEXT + RELEASE_DISPLAY_TEXT;
 			}
-			
-			String platDisplay = platform;
-			if (symbianBuildVariationString.length() > 0){
-				platDisplay = platform + "." + symbianBuildVariationString;
-			}
-			
-			displayString = displayString + " (" + platDisplay + ") [" + getSDK().getUniqueId() + "]"; //$NON-NLS-1$
+
+			displayString = displayString + " (" + platform + ") [" + getSDK().getUniqueId() + "]"; //$NON-NLS-1$
 		}
 		return displayString;
 	}
@@ -529,6 +508,13 @@
 
 
 	public String getBuildVariationName() {
-		return symbianBuildVariationString;
+		String varName = "";
+		
+		String[] tokens = getPlatformString().split("\\.");
+		if (tokens.length == 2){
+			varName = tokens[1];
+		}
+		
+		return varName;
 	}
 }