Cleanup
diff --git a/examples/org.eclipse.statet.rj.example.rcpdemo1/RServi RCP Demo 1.launch b/examples/org.eclipse.statet.rj.example.rcpdemo1/RServi RCP Demo 1.launch
index 2d47215..078e7c9 100644
--- a/examples/org.eclipse.statet.rj.example.rcpdemo1/RServi RCP Demo 1.launch
+++ b/examples/org.eclipse.statet.rj.example.rcpdemo1/RServi RCP Demo 1.launch
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">

-<setAttribute key="additional_plugins"/>

-<booleanAttribute key="append.args" value="true"/>

-<stringAttribute key="application" value="org.eclipse.statet.rj.example.rcpdemo1.application"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="false"/>

-<booleanAttribute key="automaticValidate" value="true"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RServi RCP Demo 1"/>

-<booleanAttribute key="default" value="false"/>

-<stringAttribute key="featureDefaultLocation" value="workspace"/>

-<stringAttribute key="featurePluginResolution" value="workspace"/>

-<booleanAttribute key="includeOptional" value="false"/>

-<stringAttribute key="location" value="${workspace_loc}/../runtime-org.eclipse.statet.rj.example.rcpdemo1.product"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<booleanAttribute key="pde.generated.config" value="false"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.statet.rj.example.rcpdemo1.product"/>

-<setAttribute key="selected_features">

-<setEntry value="org.eclipse.e4.rcp:default"/>

-<setEntry value="org.eclipse.emf.common:default"/>

-<setEntry value="org.eclipse.emf.ecore:default"/>

-<setEntry value="org.eclipse.rcp:default"/>

-<setEntry value="org.eclipse.statet.rj.core:default"/>

-<setEntry value="org.eclipse.statet.rj.eclient:default"/>

-</setAttribute>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="true"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="true"/>

-<booleanAttribute key="useProduct" value="true"/>

-<booleanAttribute key="usefeatures" value="false"/>

+    <setAttribute key="additional_plugins"/>

+    <booleanAttribute key="append.args" value="true"/>

+    <stringAttribute key="application" value="org.eclipse.statet.rj.example.rcpdemo1.application"/>

+    <booleanAttribute key="askclear" value="false"/>

+    <booleanAttribute key="automaticAdd" value="false"/>

+    <booleanAttribute key="automaticValidate" value="true"/>

+    <stringAttribute key="bootstrap" value=""/>

+    <stringAttribute key="checked" value="[NONE]"/>

+    <booleanAttribute key="clearConfig" value="true"/>

+    <booleanAttribute key="clearws" value="true"/>

+    <booleanAttribute key="clearwslog" value="false"/>

+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RServi RCP Demo 1"/>

+    <booleanAttribute key="default" value="false"/>

+    <stringAttribute key="featureDefaultLocation" value="workspace"/>

+    <stringAttribute key="featurePluginResolution" value="workspace"/>

+    <booleanAttribute key="includeOptional" value="false"/>

+    <stringAttribute key="location" value="${workspace_loc}/../runtime-org.eclipse.statet.rj.example.rcpdemo1.product"/>

+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+    <booleanAttribute key="pde.generated.config" value="false"/>

+    <stringAttribute key="pde.version" value="3.3"/>

+    <stringAttribute key="product" value="org.eclipse.statet.rj.example.rcpdemo1.product"/>

+    <setAttribute key="selected_features">

+        <setEntry value="org.eclipse.e4.rcp:default"/>

+        <setEntry value="org.eclipse.emf.common:default"/>

+        <setEntry value="org.eclipse.emf.ecore:default"/>

+        <setEntry value="org.eclipse.rcp:default"/>

+        <setEntry value="org.eclipse.statet.rj.core:default"/>

+        <setEntry value="org.eclipse.statet.rj.eclient:default"/>

+    </setAttribute>

+    <booleanAttribute key="show_selected_only" value="false"/>

+    <booleanAttribute key="tracing" value="false"/>

+    <booleanAttribute key="useCustomFeatures" value="true"/>

+    <booleanAttribute key="useDefaultConfig" value="true"/>

+    <booleanAttribute key="useDefaultConfigArea" value="true"/>

+    <booleanAttribute key="useProduct" value="true"/>

+    <booleanAttribute key="usefeatures" value="false"/>

 </launchConfiguration>

diff --git a/examples/org.eclipse.statet.rj.example.rcpdemo2/RServi RCP Demo 2.launch b/examples/org.eclipse.statet.rj.example.rcpdemo2/RServi RCP Demo 2.launch
index ee32cdc..5540df2 100644
--- a/examples/org.eclipse.statet.rj.example.rcpdemo2/RServi RCP Demo 2.launch
+++ b/examples/org.eclipse.statet.rj.example.rcpdemo2/RServi RCP Demo 2.launch
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">

-<setAttribute key="additional_plugins"/>

-<booleanAttribute key="append.args" value="true"/>

-<stringAttribute key="application" value="org.eclipse.statet.rj.example.rcpdemo2.application"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="false"/>

-<booleanAttribute key="automaticValidate" value="true"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RServi RCP Demo 2"/>

-<booleanAttribute key="default" value="false"/>

-<stringAttribute key="featureDefaultLocation" value="workspace"/>

-<stringAttribute key="featurePluginResolution" value="workspace"/>

-<booleanAttribute key="includeOptional" value="false"/>

-<stringAttribute key="location" value="${workspace_loc}/../runtime-org.eclipse.statet.rj.example.rcpdemo2.product"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<booleanAttribute key="pde.generated.config" value="false"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.statet.rj.example.rcpdemo2.product"/>

-<setAttribute key="selected_features">

-<setEntry value="org.eclipse.e4.rcp:default"/>

-<setEntry value="org.eclipse.emf.common:default"/>

-<setEntry value="org.eclipse.emf.ecore:default"/>

-<setEntry value="org.eclipse.rcp:default"/>

-<setEntry value="org.eclipse.statet.rj.core:default"/>

-<setEntry value="org.eclipse.statet.rj.eclient:default"/>

-</setAttribute>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="true"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="true"/>

-<booleanAttribute key="useProduct" value="true"/>

-<booleanAttribute key="usefeatures" value="false"/>

+    <setAttribute key="additional_plugins"/>

+    <booleanAttribute key="append.args" value="true"/>

+    <stringAttribute key="application" value="org.eclipse.statet.rj.example.rcpdemo2.application"/>

+    <booleanAttribute key="askclear" value="false"/>

+    <booleanAttribute key="automaticAdd" value="false"/>

+    <booleanAttribute key="automaticValidate" value="true"/>

+    <stringAttribute key="bootstrap" value=""/>

+    <stringAttribute key="checked" value="[NONE]"/>

+    <booleanAttribute key="clearConfig" value="true"/>

+    <booleanAttribute key="clearws" value="true"/>

+    <booleanAttribute key="clearwslog" value="false"/>

+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RServi RCP Demo 2"/>

+    <booleanAttribute key="default" value="false"/>

+    <stringAttribute key="featureDefaultLocation" value="workspace"/>

+    <stringAttribute key="featurePluginResolution" value="workspace"/>

+    <booleanAttribute key="includeOptional" value="false"/>

+    <stringAttribute key="location" value="${workspace_loc}/../runtime-org.eclipse.statet.rj.example.rcpdemo2.product"/>

+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+    <booleanAttribute key="pde.generated.config" value="false"/>

+    <stringAttribute key="pde.version" value="3.3"/>

+    <stringAttribute key="product" value="org.eclipse.statet.rj.example.rcpdemo2.product"/>

+    <setAttribute key="selected_features">

+        <setEntry value="org.eclipse.e4.rcp:default"/>

+        <setEntry value="org.eclipse.emf.common:default"/>

+        <setEntry value="org.eclipse.emf.ecore:default"/>

+        <setEntry value="org.eclipse.rcp:default"/>

+        <setEntry value="org.eclipse.statet.rj.core:default"/>

+        <setEntry value="org.eclipse.statet.rj.eclient:default"/>

+    </setAttribute>

+    <booleanAttribute key="show_selected_only" value="false"/>

+    <booleanAttribute key="tracing" value="false"/>

+    <booleanAttribute key="useCustomFeatures" value="true"/>

+    <booleanAttribute key="useDefaultConfig" value="true"/>

+    <booleanAttribute key="useDefaultConfigArea" value="true"/>

+    <booleanAttribute key="useProduct" value="true"/>

+    <booleanAttribute key="usefeatures" value="false"/>

 </launchConfiguration>