diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/.project b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/.project
index 381206500..5bccec749 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/.project
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/.project
@@ -5,16 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.pde.FeatureBuilder</name>
 			<arguments>
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/.settings/org.eclipse.jdt.core.prefs b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dc..9f6ece88b 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/.settings/org.eclipse.jdt.core.prefs
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/.settings/org.eclipse.jdt.core.prefs
@@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/favourites/FavouritesPreference.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/favourites/FavouritesPreference.java
index 3d22ef8b3..cad921eb6 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/favourites/FavouritesPreference.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/favourites/FavouritesPreference.java
@@ -12,15 +12,12 @@ package org.springframework.tooling.ls.eclipse.gotosymbol.favourites;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.MenuItem;
-import org.springframework.ide.eclipse.boot.pstore.IPropertyStore;
-import org.springframework.ide.eclipse.boot.pstore.PropertyStoreApi;
-import org.springframework.ide.eclipse.boot.pstore.PropertyStores;
+
 import org.springframework.tooling.ls.eclipse.gotosymbol.GotoSymbolPlugin;
 import org.springframework.tooling.ls.eclipse.gotosymbol.dialogs.GotoSymbolDialogModel.Favourite;
-import org.springsource.ide.eclipse.commons.core.util.StringUtil;
+import org.springsource.ide.eclipse.commons.core.pstore.IPropertyStore;
+import org.springsource.ide.eclipse.commons.core.pstore.PropertyStoreApi;
+import org.springsource.ide.eclipse.commons.core.pstore.PropertyStores;
 import org.springsource.ide.eclipse.commons.livexp.util.Log;
 
 public class FavouritesPreference  {