--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/sandbox/SBSv2ConfigData.java	Mon May 24 08:46:47 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/sandbox/SBSv2ConfigData.java	Mon May 24 09:05:09 2010 -0500
@@ -52,18 +52,15 @@
 		} 
 	}
 
-	@Override
 	public String getBuildAlias() {
 		return buildAlias;
 	}
 
-	@Override
 	public String getMeaning() {
 		return meaning;
 	}
 
 
-	@Override
 	public String getReleaseDirectory(ISymbianSDK sdk) {
 		if (releaseDirectory == null){
 			initDefaultConfigTargetInfo(sdk);
@@ -95,13 +92,11 @@
 		
 	}
 
-	@Override
 	public ISBSv2ConfigPreprocessorInfo getBuildData(ISymbianSDK sdk) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	@Override
 	public String getTraditionalTarget(ISymbianSDK sdk) {
 		if (target == null){
 			initDefaultConfigTargetInfo(sdk);
@@ -110,7 +105,6 @@
 		return target;
 	}
 
-	@Override
 	public String getTraditionalPlatform(ISymbianSDK sdk) {
 		if (platform == null){
 			initDefaultConfigTargetInfo(sdk);
@@ -123,7 +117,6 @@
 		return "Alias = " + buildAlias + " : Meaning = " + meaning;
 	}
 
-	@Override
 	public ISymbianSDK getSupportingSDK() {
 		return sdk;
 	}

--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/sandbox/SBSv2QueryData.java	Mon May 24 08:46:47 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/sandbox/SBSv2QueryData.java	Mon May 24 09:05:09 2010 -0500
@@ -31,7 +31,6 @@
 	HashMap<ISymbianSDK, List<ISBSv2ConfigData>> sbsSDKBuildConfigMap = new HashMap<ISymbianSDK, List<ISBSv2ConfigData>>();
 	HashMap<ISymbianSDK, List<String>> sdkProductVariantList = new HashMap<ISymbianSDK, List<String>>();
 	
-	@Override
 	public void addConfigurationData(ISymbianSDK sdk, ISBSv2ConfigData configData) {
 		
 		if (sdk == null){
@@ -51,12 +50,10 @@
 		configDataForSDK.add(configData);
 	}
 
-	@Override
 	public HashMap<String, ISBSv2ConfigData> getBaseSBSConfigurations() {
 		return baseSBSConfigs;
 	}
 	
-	@Override
 	public List<ISBSv2ConfigData> getSDKSpecificConfigData(ISymbianSDK sdk) {
 		List<ISBSv2ConfigData> sdkDefinedConfigs =  new ArrayList<ISBSv2ConfigData>();
 		
@@ -78,17 +75,14 @@
 		return sdkDefinedConfigs;
 	}
 	
-	@Override
 	public List<ISBSv2ConfigData> getAllConfigurationsForSDK(ISymbianSDK sdk) {
 		return sbsSDKBuildConfigMap.get(sdk);
 	}
 
-	@Override
 	public List<String> getProductsForSDK(ISymbianSDK sdk) {
 		return sdkProductVariantList.get(sdk);
 	}
 
-	@Override
 	public void addProductListForSDK(ISymbianSDK sdk, List<String> products) {
 		if (null == sdkProductVariantList.get(sdk) || 
 			sdkProductVariantList.size() == 0){
@@ -97,7 +91,6 @@
 		}
 	}
 
-	@Override
 	public ISBSv2ConfigData getSBSConfigByAlias(ISymbianSDK sdk, String alias) {
 		
 		if (sdk == null){
@@ -115,7 +108,6 @@
 		return null;
 	}
 
-	@Override
 	public ISBSv2ConfigData getSBSConfigByMeaning(ISymbianSDK sdk, String meaning) {
 		if (sdk == null){
 			for (String aliasKey : baseSBSConfigs.keySet()){