diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ScoreableProposal.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ScoreableProposal.java
index 36e29082f..28440c954 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ScoreableProposal.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ScoreableProposal.java
@@ -37,7 +37,7 @@ public abstract class ScoreableProposal implements ICompletionProposal {
 			if (p1 instanceof ScoreableProposal && p2 instanceof ScoreableProposal) {
 				double s1 = ((ScoreableProposal)p1).getScore();
 				double s2 = ((ScoreableProposal)p2).getScore();
-				if (s1==s2) {
+				if (s1 == s2) {
 					String name1 = ((ScoreableProposal)p1).getLabel();
 					String name2 = ((ScoreableProposal)p2).getLabel();
 					return name1.compareTo(name2);
diff --git a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
index 6bf6e5778..3f2f436bf 100644
--- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
+++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
@@ -440,7 +440,8 @@ public class Editor {
 		textBefore = replaceSelection(textBefore);
 		textAfter = Arrays.stream(textAfter)
 				.map((String t) -> replaceSelection(t))
-				.collect(Collectors.toList()).toArray(new String[0]);
+				.toArray(String[]::new);
+
 		editor.setText(textBefore);
 		editor.assertCompletions(isInteresting, textAfter);
 	}
@@ -564,7 +565,7 @@ public class Editor {
 
 			private String sortKey(CompletionItem item) {
 				String k = item.getSortText();
-				if (k==null) {
+				if (k == null) {
 					k = item.getLabel();
 				}
 				return k;
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/ClasspathResourceCompletionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/ClasspathResourceCompletionProvider.java
index 6468af78a..2810ab931 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/ClasspathResourceCompletionProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/ClasspathResourceCompletionProvider.java
@@ -10,20 +10,11 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.app;
 
-import static org.springframework.ide.vscode.boot.common.CommonLanguageTools.getValueType;
-
 import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ide.vscode.boot.common.PropertyCompletionFactory;
-import org.springframework.ide.vscode.boot.java.value.ValuePropertyKeyProposal;
 import org.springframework.ide.vscode.boot.metadata.CachingValueProvider;
-import org.springframework.ide.vscode.boot.metadata.PropertyInfo;
-import org.springframework.ide.vscode.boot.metadata.SpringPropertyIndexProvider;
-import org.springframework.ide.vscode.boot.metadata.ValueProviderRegistry;
 import org.springframework.ide.vscode.boot.metadata.hints.StsValueHint;
 import org.springframework.ide.vscode.boot.metadata.hints.ValueHintHoverInfo;
 import org.springframework.ide.vscode.commons.java.IClasspathUtil;
@@ -34,9 +25,7 @@ import org.springframework.ide.vscode.commons.languageserver.completion.IComplet
 import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder;
 import org.springframework.ide.vscode.commons.languageserver.util.LanguageSpecific;
 import org.springframework.ide.vscode.commons.languageserver.util.PrefixFinder;
-import org.springframework.ide.vscode.commons.util.BadLocationException;
 import org.springframework.ide.vscode.commons.util.FuzzyMatcher;
-import org.springframework.ide.vscode.commons.util.FuzzyMap.Match;
 import org.springframework.ide.vscode.commons.util.text.LanguageId;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;
 import org.springframework.stereotype.Component;