diff --git a/extras/site/site.xml b/extras/site/site.xml
index 0021ec7..a9c782e 100644
--- a/extras/site/site.xml
+++ b/extras/site/site.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- JBDS-2361 this site is no longer needed: replaced by https://devstudio.jboss.com/updates/6.0-staging/central/core/ -->
+
 <site>
 	<description>JBoss Developer Studio 6.0 Extras</description>
 
-	<!-- JBDS 4.0 -->
-	
 	<category-def name="JBoss Certified Features" label="JBoss Certified Features">
 		<description>
 Features certified with JBoss Developer Studio have been tested by Red Hat. 
@@ -16,9 +16,12 @@ Features selected by Red Hat for use with JBoss Developer Studio.
 		</description>
 	</category-def>
 
+	<!-- JBDS-2361 REMOVE
 	<feature url="features/org.testng.eclipse_0.0.0.jar" id="org.testng.eclipse" version="0.0.0"></feature>
+	-->
 	<!-- JBDS-2361 removed <feature url="features/com.jboss.jbds.testng.feature_0.0.0.jar" id="com.jboss.jbds.testng.feature" version="0.0.0"><category name="JBoss Certified Features" /></feature> -->
 
+	<!-- JBDS-2361 REMOVE
 	<feature url="features/org.springframework.ide.eclipse.feature_0.0.0.jar" id="org.springframework.ide.eclipse.feature" version="0.0.0"></feature>
 	<feature url="features/org.springframework.ide.eclipse.aop.feature_0.0.0.jar" id="org.springframework.ide.eclipse.aop.feature" version="0.0.0"></feature>
 	<feature url="features/org.springframework.ide.eclipse.osgi.feature_0.0.0.jar" id="org.springframework.ide.eclipse.osgi.feature" version="0.0.0"></feature>
@@ -27,10 +30,13 @@ Features selected by Red Hat for use with JBoss Developer Studio.
 	<feature url="features/org.springframework.ide.eclipse.integration.feature_0.0.0.jar" id="org.springframework.ide.eclipse.integration.feature" version="0.0.0"></feature>
 	<feature url="features/org.springframework.ide.eclipse.security.feature_0.0.0.jar" id="org.springframework.ide.eclipse.security.feature" version="0.0.0"></feature>
 	<feature url="features/org.springframework.ide.eclipse.autowire.feature_0.0.0.jar" id="org.springframework.ide.eclipse.autowire.feature" version="0.0.0"></feature>
+	-->
 	<!-- JBDS-2361 removed <feature url="features/com.jboss.jbds.springide.feature_0.0.0.jar" id="com.jboss.jbds.springide.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature> -->
 
+	<!-- JBDS-2361 REMOVE
 	<feature url="features/org.eclipse.egit.mylyn_0.0.0.jar" id="org.eclipse.egit.mylyn" version="0.0.0"></feature>
 	<feature url="features/org.eclipse.mylyn.github.feature_0.0.0.jar" id="org.eclipse.mylyn.github.feature" version="0.0.0"></feature>
+	-->
 	<!-- JBDS-2361 removed <feature url="features/com.jboss.jbds.git.mylyn.feature_0.0.0.jar" id="com.jboss.jbds.git.mylyn.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature> -->
 
 	<!-- JBDS-2284 remove 1.3.9 from Extras; can get 2.0.2 from JBT Central site -->
@@ -39,6 +45,7 @@ Features selected by Red Hat for use with JBoss Developer Studio.
 	<feature url="features/com.jboss.jbds.findbugs.feature_0.0.0.jar" id="com.jboss.jbds.findbugs.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature>
 	-->
 
+	<!-- JBDS-2361 REMOVE
 	<feature url="features/org.eclipse.mylyn.bugzilla_feature_0.0.0.jar" id="org.eclipse.mylyn.bugzilla_feature" version="0.0.0"></feature>
 	<feature url="features/org.eclipse.mylyn.commons_0.0.0.jar" id="org.eclipse.mylyn.commons" version="0.0.0"></feature>
 	<feature url="features/org.eclipse.mylyn.context_feature_0.0.0.jar" id="org.eclipse.mylyn.context_feature" version="0.0.0"></feature>
@@ -51,16 +58,18 @@ Features selected by Red Hat for use with JBoss Developer Studio.
 	<feature url="features/org.eclipse.mylyn.team_feature_0.0.0.jar" id="org.eclipse.mylyn.team_feature" version="0.0.0"></feature>
 	<feature url="features/org.eclipse.mylyn.versions_0.0.0.jar" id="org.eclipse.mylyn.versions" version="0.0.0"></feature>
 	<feature url="features/org.eclipse.mylyn.wikitext_feature_0.0.0.jar" id="org.eclipse.mylyn.wikitext_feature" version="0.0.0"></feature>
+	-->
 	<!-- JBDS-2098 add defaults for issues.jboss.org and bugzilla.redhat.com -->
-	<!-- TODO: JBDS-2361 -->
+	<!-- JBDS-2361 REMOVE
 	<feature url="features/com.jboss.jbds.mylyn.feature_0.0.0.jar" id="com.jboss.jbds.mylyn.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature>
+	-->
 	
 	<!-- JBIDE-12562 remove pmd 3.2.4 from Extras; can get 3.2.6 from JBT Central site -->
 	<!-- 
 	<feature url="features/net.sourceforge.pmd.eclipse_0.0.0.jar" id="net.sourceforge.pmd.eclipse" version="0.0.0"></feature>
 	<feature url="features/com.jboss.jbds.pmd.feature_0.0.0.jar" id="com.jboss.jbds.pmd.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature>
 	-->
-
+	<!-- JBDS-2361 REMOVE
 	<feature url="features/com.collabnet.subversion.merge.feature_0.0.0.jar" id="com.collabnet.subversion.merge.feature" version="0.0.0"></feature>
 	<feature url="features/net.java.dev.jna_0.0.0.jar" id="net.java.dev.jna" version="0.0.0"></feature>
 	<feature url="features/org.tigris.subversion.clientadapter.feature_0.0.0.jar" id="org.tigris.subversion.clientadapter.feature" version="0.0.0"></feature>
@@ -70,14 +79,19 @@ Features selected by Red Hat for use with JBoss Developer Studio.
 	<feature url="features/org.tigris.subversion.subclipse.mylyn_0.0.0.jar" id="org.tigris.subversion.subclipse.mylyn" version="0.0.0"></feature>
 	<feature url="features/org.tigris.subversion.subclipse_0.0.0.jar" id="org.tigris.subversion.subclipse" version="0.0.0"></feature>
 	<feature url="features/org.tmatesoft.svnkit_0.0.0.jar" id="org.tmatesoft.svnkit" version="0.0.0"></feature>
+	-->
 	<!-- JBDS-2361 removed <feature url="features/com.jboss.jbds.subclipse.feature_0.0.0.jar" id="com.jboss.jbds.subclipse.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature>
 	<feature url="features/com.jboss.jbds.subclipse.mylyn.feature_0.0.0.jar" id="com.jboss.jbds.subclipse.mylyn.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature> -->
 	
+	<!-- JBDS-2361 REMOVE move to Core site (hidden features)
 	<feature url="features/org.jboss.tools.maven.gwt.feature_0.0.0.jar" id="org.jboss.tools.maven.gwt.feature" version="0.0.0">	</feature>
 	<feature url="features/org.jboss.tools.maven.jbosspackaging.feature_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.feature" version="0.0.0"></feature>
+	-->
 	<!-- JBDS-2383 <feature url="features/com.jboss.jbds.m2e.extras.feature_0.0.0.jar" id="com.jboss.jbds.m2e.extras.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature> -->
 
+	<!-- JBDS-2361 REMOVE
 	<feature url="features/net.sf.eclipsecs_0.0.0.jar" id="net.sf.eclipsecs" version="0.0.0"></feature>
+	-->
 	<!-- JBDS-2361 removed <feature url="features/com.jboss.jbds.eclipsecs.feature_0.0.0.jar" id="com.jboss.jbds.eclipsecs.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature> -->
 
 	<!-- JBIDE-12498 cannot build locally; can get 20.0.3 from JBT Central site --> 
@@ -89,7 +103,7 @@ Features selected by Red Hat for use with JBoss Developer Studio.
 	<feature url="features/com.android.ide.eclipse.traceview_0.0.0.jar" id="com.android.ide.eclipse.traceview" version="0.0.0"></feature>
 	<feature url="features/com.jboss.jbds.adt.feature_0.0.0.jar" id="com.jboss.jbds.adt.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature>
 	-->
-
+	<!-- JBDS-2361 REMOVE
 	<feature url="features/com.google.gdt.eclipse.designer.editor.feature_0.0.0.jar" id="com.google.gdt.eclipse.designer.editor.feature" version="0.0.0"></feature>
 	<feature url="features/com.google.gdt.eclipse.designer.gpe.feature_0.0.0.jar" id="com.google.gdt.eclipse.designer.gpe.feature" version="0.0.0"></feature>
 	<feature url="features/com.google.gdt.eclipse.designer.hosted.feature_0.0.0.jar" id="com.google.gdt.eclipse.designer.hosted.feature" version="0.0.0"></feature>
@@ -98,9 +112,12 @@ Features selected by Red Hat for use with JBoss Developer Studio.
 	<feature url="features/org.eclipse.wb.core.feature_0.0.0.jar" id="org.eclipse.wb.core.feature" version="0.0.0"></feature>
 	<feature url="features/org.eclipse.wb.core.xml.feature_0.0.0.jar" id="org.eclipse.wb.core.xml.feature" version="0.0.0"></feature>
 	<feature url="features/org.eclipse.wb.css.feature_0.0.0.jar" id="org.eclipse.wb.css.feature" version="0.0.0"></feature>
+	-->
 	<!-- JBDS-2361 removed <feature url="features/com.jboss.jbds.gwt.designer.feature_0.0.0.jar" id="com.jboss.jbds.gwt.designer.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature>
 	<feature url="features/com.jboss.jbds.gwt.feature_0.0.0.jar" id="com.jboss.jbds.gwt.feature" version="0.0.0"><category name="JBoss Selected Features" /></feature> -->
 
 	<!-- TODO: JBIDE-11111 -->
+	<!-- JBDS-2361 REMOVE - this is also on the product site
 	<feature url="features/com.jboss.jbds.central.discovery.feature_0.0.0.jar" id="com.jboss.jbds.central.discovery.feature" version="0.0.0"></feature>
+	-->
 </site>
diff --git a/product/pom.xml b/product/pom.xml
index 62ca71b..65f5ae7 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -33,7 +33,7 @@
 		<module>plugins</module>
 		<module>features</module>
 		<module>site</module>
-		<module>../extras</module>
+		<!-- JBDS-2361 site no longer required <module>../extras</module> -->
 		<!-- <module>../techpreview</module> -->
 		<module>installer</module>
 		<module>sources</module>
diff --git a/product/site/category.xml b/product/site/category.xml
index fab85c4..c9f9bd1 100644
--- a/product/site/category.xml
+++ b/product/site/category.xml
@@ -202,23 +202,15 @@
 		<category name="CoreTools" />
 		<category name="MavenTools" />
 	</feature>
-	<!-- ONLY in JBT and JBDS Extras
+	<!-- ONLY in JBT and JBDS Central -->
 	<feature url="features/org.jboss.tools.maven.jbosspackaging.feature_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.feature" version="0.0.0">
-		<category name="MavenTools" />
 	</feature>
 	<feature url="features/org.jboss.tools.maven.gwt.feature_0.0.0.jar" id="org.jboss.tools.maven.gwt.feature" version="0.0.0">
-		<category name="MavenTools" />
 	</feature>
-	-->
-	
 	<!-- only in JBT
 	<feature url="features/org.jboss.tools.gwt.feature_0.0.0.jar" id="org.jboss.tools.gwt.feature" version="0.0.0">
 		<category name="GeneralTools" />
 	</feature>
-	<feature url="features/org.jboss.tools.common.mylyn.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.feature" version="0.0.0">
-		<category name="CoreTools" />
-		<category name="GeneralTools"/>
-	</feature>
 	-->
 	
 	<feature url="features/org.jboss.tools.common.jdt.feature_0.0.0.jar" id="org.jboss.tools.common.jdt.feature" version="0.0.0">
@@ -231,6 +223,8 @@
 	</feature>
 	<feature url="features/org.jboss.tools.common.core.feature_0.0.0.jar" id="org.jboss.tools.common.core.feature" version="0.0.0">
 	</feature>
+	<feature url="features/org.jboss.tools.common.mylyn.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.feature" version="0.0.0">
+	</feature>
 	<feature url="features/org.jboss.tools.common.text.ext.feature_0.0.0.jar" id="org.jboss.tools.common.text.ext.feature" version="0.0.0">
 	</feature>
 	<feature url="features/org.jboss.tools.common.ui.feature_0.0.0.jar" id="org.jboss.tools.common.ui.feature" version="0.0.0">