--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv1BuildInfo.java	Thu Aug 05 15:32:59 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv1BuildInfo.java	Fri Aug 06 10:12:39 2010 -0500
@@ -322,8 +322,6 @@
 	public List<String> getBuiltinMacros(ISymbianBuildContext context) {
 		List<String> macros = new ArrayList<String>();
 		
-		macros.add("SBSV2"); //$NON-NLS-1$
-		
 		// add the macros that should always be defined
 		macros.add("__SYMBIAN32__"); //$NON-NLS-1$
 		macros.add("_UNICODE"); //$NON-NLS-1$
@@ -339,9 +337,11 @@
 		return macros;
 	}
 	
-	// TODO: This needs to move under ISymianBuildContext. For abld we can use this method.
-	// For SBSv2, this is configuration dependent and the information is obtained from
-	// the sbs --query=config[<config>] call.
+	/**
+	 * ABLD specifc mechanism of parsing perl script to get targettypes. This is imperfect
+	 * but is the best way to generalize targettypes. Raptor/SBSv2 API improves on this
+	 * by retrieving configuration specific targettypes.
+	 */
 	public List<String> getSupportedTargetTypes() {
 		
 		synchronized (supportedTargetTypesList) {