diff -r cd53d0a37fd4 -r 8bfab012a62c core/com.nokia.carbide.cpp/plugin.xml
--- a/core/com.nokia.carbide.cpp/plugin.xml	Mon Oct 12 13:56:07 2009 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.xml	Mon Oct 12 15:24:17 2009 -0500
@@ -570,62 +570,4 @@
     </keyword>
  </extension>
 
-<!-- =================================================================================== -->
-<!-- Enable Classic Update and disable P2 Update                                         -->
-<!-- =================================================================================== -->
-
-	<extension
-	      point="org.eclipse.ui.activities">
-	      
-		<!-- please leave defaultEnablement on one line, the build script uses grep to remove this line -->
-		<defaultEnablement id="org.eclipse.equinox.p2.ui.sdk.classicUpdate" />
-
-		<activity
-	        id="org.eclipse.equinox.p2.ui.sdk.p2.update"
-	        name="P2 Update UI">
-		</activity>
-		
-		<category
-			id="org.eclipse.equinox.p2.ui.sdk.p2.update.category"
-			name="P2 Update UI">
-		</category>
-		
-		<categoryActivityBinding
-			activityId="org.eclipse.equinox.p2.ui.sdk.p2.update"
-			categoryId="org.eclipse.equinox.p2.ui.sdk.p2.update.category">
-		</categoryActivityBinding>
-	
-		<activityPatternBinding
-			activityId="org.eclipse.equinox.p2.ui.sdk.p2.update"
-			isEqualityPattern="true"
-			pattern="org.eclipse.equinox.p2.ui.sdk/org.eclipse.equinox.p2.ui.sdk.update">
-		</activityPatternBinding>
-		
-		<activityPatternBinding
-			activityId="org.eclipse.equinox.p2.ui.sdk.p2.update"
-			isEqualityPattern="true"
-			pattern="org.eclipse.equinox.p2.ui.sdk/org.eclipse.equinox.p2.ui.sdk.install">
-		</activityPatternBinding>
-	      
-	</extension>
-
-<!--
-	<extension
-         point="org.eclipse.ui.preferencePages">
-	  	<page            
-            category="org.eclipse.ui.preferencePages.Workbench"
-            name="Capabilities"
-            id="org.eclipse.sdk.capabilities">
-            <class class="org.eclipse.ui.activities.ActivityCategoryPreferencePage">
-                <parameter name="allowAdvanced" value="true"/>
-                <parameter name="captionMessage" value="Capabilities allow you to enable or disable various product components.  These capabilities are grouped according to a set of predefined categories." />
-            	<parameter name="activityName" value="&amp;Capabilities" />
-                <parameter name="categoryName" value="&amp;Capabilities" />
-            	<parameter name="activityPromptButton" value="&amp;Prompt when enabling capabilities"/>
-            	<parameter name="activityPromptButtonTooltip" value="Prompt when a feature is first used that requires enablement of capabilities"/>
-            </class>
-      </page>   
-   </extension>
--->
-
 </plugin>