diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
index f90833096..d0bafb3c7 100644
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
@@ -75,4 +75,40 @@
 		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
 	</feature>
 
+	<bundle id="org.springframework.tooling.ls.eclipse.commons">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<feature id="tm-feature">
+		<category name="Uncategorized"/>
+	</feature>
+
+	<bundle id="org.eclipse.lsp4e">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.eclipse.lsp4j">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.eclipse.lsp4j.jsonrpc">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.eclipse.xtext.xbase.lib">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="com.google.gson">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.jcodings">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.joni">
+		<category name="Uncategorized"/>
+	</bundle>
+
 </site>
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml
index 00ef93583..f928a6a9b 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml
@@ -26,11 +26,4 @@
 		unpack="false">
 	</plugin>
 
-	<plugin
-		id="org.springframework.tooling.ls.eclipse.commons"
-		download-size="0"
-		install-size="0"
-		version="0.0.0"
-		unpack="false">
-	</plugin>
 </feature>
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
index a2efd8a6d..498fe1ac0 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Language Server Commons
 Bundle-SymbolicName: org.springframework.tooling.ls.eclipse.commons;singleton:=true
 Bundle-Version: 4.0.0.qualifier
-Bundle-Activator: org.springframework.tooling.ls.eclipse.commons.LsEclipseCommonsActivator
 Bundle-Vendor: Pivotal, Inc.
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/LsEclipseCommonsActivator.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/LsEclipseCommonsActivator.java
deleted file mode 100644
index 58f80c83c..000000000
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/LsEclipseCommonsActivator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.springframework.tooling.ls.eclipse.commons;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class LsEclipseCommonsActivator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.springframework.tooling.ls.eclipse.commons"; //$NON-NLS-1$
-
-	// The shared instance
-	private static LsEclipseCommonsActivator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public LsEclipseCommonsActivator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static LsEclipseCommonsActivator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClient.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClient.java
index bd35b3d3f..513711148 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClient.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClient.java
@@ -10,10 +10,7 @@
  *******************************************************************************/
 package org.springframework.tooling.ls.eclipse.commons;
 
-import java.util.concurrent.CompletableFuture;
-
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
-import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
 import org.eclipse.lsp4j.services.LanguageClient;
 
 /**
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
index d4afd2ab2..d904c61d5 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
@@ -28,6 +28,10 @@
 
 	<category-def name="deps" label="Dependencies"/>
 
+	<bundle id="org.springframework.tooling.ls.eclipse.commons">
+		<category name="deps"/>
+	</bundle>
+
 	<feature id="tm-feature">
 		<category name="deps"/>
 	</feature>
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml b/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml
index 7e9fba2a8..83d9101a6 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml
@@ -8,6 +8,10 @@
 
 	<category-def name="deps" label="Dependencies"/>
 
+	<bundle id="org.springframework.tooling.ls.eclipse.commons">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.eclipse.lsp4e">
 		<category name="deps"/>
 	</bundle>