diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LocalSpringBootApp.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LocalSpringBootApp.java
index a16f87482..9a410656a 100644
--- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LocalSpringBootApp.java
+++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LocalSpringBootApp.java
@@ -64,9 +64,7 @@ public class LocalSpringBootApp extends AbstractSpringBootApp {
 	public static Collection<SpringBootApp> getAllRunningJavaApps() throws Exception {
 		return cache.getAllRunningJavaApps();
 	}
-	/**
-	 * @return Map that contains the boot apps, mapping the process ID -> boot app accessor object
-	 */
+
 	public static Collection<SpringBootApp> getAllRunningSpringApps() throws Exception {
 		return getAllRunningJavaApps().stream().filter(SpringBootApp::isSpringBootApp).collect(CollectorUtil.toImmutableList());
 	}
diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java
index 51b536ba4..e8f8709da 100644
--- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java
+++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Pivotal, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Pivotal, Inc. - initial API and implementation
+ *******************************************************************************/
 package org.springframework.ide.vscode.commons.boot.app.cli;
 
 import java.io.IOException;
@@ -30,7 +40,7 @@ public interface SpringBootApp {
 	Properties getSystemProperties() throws Exception;
 	JMXConnector getJmxConnector() throws MalformedURLException, IOException;
 
-	default String getSystemProperties(String string) throws Exception {
+	default String getSystemProperty(String string) throws Exception {
 		Object r = getSystemProperties().get(string);
 		if (r instanceof String) {
 			return (String) r;
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/DefaultRunningAppProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/DefaultRunningAppProvider.java
index ac35bbad7..b2b573b3d 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/DefaultRunningAppProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/DefaultRunningAppProvider.java
@@ -94,7 +94,7 @@ public class DefaultRunningAppProvider implements ProjectAwareRunningAppProvider
 
 	public static boolean doesProjectNameMatch(SpringBootApp app, IJavaProject project) {
 		try {
-			String projectName = app.getSystemProperties("spring.boot.project.name");
+			String projectName = app.getSystemProperty("spring.boot.project.name");
 			return projectName != null && projectName.equals(project.getElementName());
 		}
 		catch (Exception e) {
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RemoteRunningAppsProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RemoteRunningAppsProvider.java
index f304abe99..9feb58c2c 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RemoteRunningAppsProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RemoteRunningAppsProvider.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Pivotal, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Pivotal, Inc. - initial API and implementation
+ *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.handlers;
 
 import java.util.Collection;
@@ -14,8 +24,6 @@ import org.springframework.ide.vscode.commons.languageserver.util.Settings;
 import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
 import org.springframework.ide.vscode.commons.util.CollectorUtil;
 
-import com.google.common.collect.ImmutableList;
-
 public class RemoteRunningAppsProvider implements RunningAppProvider {
 
 	private static Logger logger = LoggerFactory.getLogger(RemoteRunningAppsProvider.class);
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RunningAppProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RunningAppProvider.java
index d1d97848b..961423bc2 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RunningAppProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RunningAppProvider.java
@@ -40,9 +40,6 @@ public interface RunningAppProvider {
 
 	public static final RunningAppProvider NULL = () -> ImmutableList.of();
 
-	/**
-	 * returns all running spring boot applications on the local machine.
-	 */
 	Collection<SpringBootApp> getAllRunningSpringApps() throws Exception;
 
 	static RunningAppProvider createDefault(SimpleLanguageServer server) {