diff --git a/headless-services/boot-java-language-server/.classpath b/headless-services/boot-java-language-server/.classpath
deleted file mode 100644
index 5e8a55fef..000000000
--- a/headless-services/boot-java-language-server/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/headless-services/boot-java-language-server/.settings/org.eclipse.core.resources.prefs b/headless-services/boot-java-language-server/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/headless-services/boot-java-language-server/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/headless-services/boot-java-language-server/.settings/org.eclipse.jdt.core.prefs b/headless-services/boot-java-language-server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 714351aec..000000000
--- a/headless-services/boot-java-language-server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/headless-services/boot-java-language-server/.settings/org.eclipse.jdt.ui.prefs b/headless-services/boot-java-language-server/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 68f26e829..000000000
--- a/headless-services/boot-java-language-server/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,59 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=false
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_type_arguments=false
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=true
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/headless-services/boot-java-language-server/.settings/org.eclipse.m2e.core.prefs b/headless-services/boot-java-language-server/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/headless-services/boot-java-language-server/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/headless-services/boot-java-language-server/.settings/org.springframework.ide.eclipse.prefs b/headless-services/boot-java-language-server/.settings/org.springframework.ide.eclipse.prefs
deleted file mode 100644
index a12794d68..000000000
--- a/headless-services/boot-java-language-server/.settings/org.springframework.ide.eclipse.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-boot.validation.initialized=true
-eclipse.preferences.version=1
diff --git a/headless-services/boot-java-language-server/build.sh b/headless-services/boot-java-language-server/build.sh
deleted file mode 100755
index 04536e095..000000000
--- a/headless-services/boot-java-language-server/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-set -e
-../mvnw -f ../pom.xml -pl boot-java-language-server -am clean install
diff --git a/headless-services/boot-java-language-server/pom.xml b/headless-services/boot-java-language-server/pom.xml
deleted file mode 100644
index 388b54c8d..000000000
--- a/headless-services/boot-java-language-server/pom.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
- 4.0.0
- boot-java-language-server
- jar
-
-
- org.springframework.ide.vscode
- commons-parent
- 0.1.4-SNAPSHOT
- ../commons/pom.xml
-
-
-
- ${project.version}
-
-
-
-
-
- oss-sonatype
- oss-sonatype
- https://oss.sonatype.org/content/repositories/snapshots/
-
- true
-
-
-
-
-
-
- distribution-repository
- Temporary Staging Repository
- file://${basedir}/dist
-
-
-
-
-
- org.springframework.ide.vscode
- commons-boot
- ${dependencies.version}
-
-
-
-
- org.mockito
- mockito-all
- ${mockito-version}
- test
-
-
- org.springframework.ide.vscode
- language-server-test-harness
- ${dependencies.version}
- test
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.3
-
- 1.8
- 1.8
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
- 1.5.8.RELEASE
-
-
-
- repackage
-
-
- org.springframework.ide.vscode.boot.java.Main
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.19.1
-
-
- test-projects/**
-
-
-
-
-
-
diff --git a/headless-services/boot-properties-language-server/.classpath b/headless-services/boot-properties-language-server/.classpath
deleted file mode 100644
index 5e8a55fef..000000000
--- a/headless-services/boot-properties-language-server/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/headless-services/boot-properties-language-server/.settings/org.eclipse.core.resources.prefs b/headless-services/boot-properties-language-server/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/headless-services/boot-properties-language-server/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/headless-services/boot-properties-language-server/.settings/org.eclipse.jdt.core.prefs b/headless-services/boot-properties-language-server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 714351aec..000000000
--- a/headless-services/boot-properties-language-server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/headless-services/boot-properties-language-server/.settings/org.eclipse.jdt.ui.prefs b/headless-services/boot-properties-language-server/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index c743e1c07..000000000
--- a/headless-services/boot-properties-language-server/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,59 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=false
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_type_arguments=false
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=true
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/headless-services/boot-properties-language-server/.settings/org.eclipse.m2e.core.prefs b/headless-services/boot-properties-language-server/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1c..000000000
--- a/headless-services/boot-properties-language-server/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/headless-services/boot-properties-language-server/build.sh b/headless-services/boot-properties-language-server/build.sh
deleted file mode 100755
index 6607d2fba..000000000
--- a/headless-services/boot-properties-language-server/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-set -e
-../mvnw -f ../pom.xml -pl boot-properties-language-server -am clean install
diff --git a/headless-services/boot-properties-language-server/pom.xml b/headless-services/boot-properties-language-server/pom.xml
deleted file mode 100644
index 94d574047..000000000
--- a/headless-services/boot-properties-language-server/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
- 4.0.0
- boot-properties-language-server
- jar
-
-
- org.springframework.ide.vscode
- commons-parent
- 0.1.4-SNAPSHOT
- ../commons/pom.xml
-
-
-
- ${project.version}
-
-
-
-
- org.springframework.ide.vscode
- commons-boot
- ${dependencies.version}
-
-
-
-
- org.springframework.ide.vscode
- language-server-test-harness
- ${dependencies.version}
- test
-
-
-
- org.mockito
- mockito-all
- ${mockito-version}
- test
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.3
-
- 1.8
- 1.8
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
- 1.4.1.RELEASE
-
-
-
- repackage
-
-
- org.springframework.ide.vscode.boot.properties.Main
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.19.1
-
-
- test-projects/**
-
-
-
-
-
-
diff --git a/headless-services/pom.xml b/headless-services/pom.xml
index 08675cf44..9c2738c70 100644
--- a/headless-services/pom.xml
+++ b/headless-services/pom.xml
@@ -14,8 +14,6 @@
manifest-yaml-language-server
concourse-language-server
spring-boot-language-server
- boot-properties-language-server
- boot-java-language-server
bosh-language-server