diff --git a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorMicroservice.java b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorMicroservice.java
index bf5d317dc1b..190baba090d 100644
--- a/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorMicroservice.java
+++ b/components/org.wso2.carbon.siddhi.editor.core/src/main/java/org/wso2/carbon/siddhi/editor/core/internal/EditorMicroservice.java
@@ -126,7 +126,7 @@
         service = Microservice.class,
         immediate = true
 )
-@Path("/server")
+@Path("/editor")
 public class EditorMicroservice implements Microservice {
     private static final Logger log = LoggerFactory.getLogger(EditorMicroservice.class);
     private static final String FILE_SEPARATOR = "file.separator";
diff --git a/components/si-tooling-distribution/pom.xml b/components/si-tooling-distribution/pom.xml
index c946e5e248a..0d90d6ac6c1 100644
--- a/components/si-tooling-distribution/pom.xml
+++ b/components/si-tooling-distribution/pom.xml
@@ -878,27 +878,14 @@
                         <phase>install</phase>
                         <configuration>
                             <target>
-                                <!--<delete dir="target/archive-tmp"/>-->
-                                <!--<delete dir="target/dependency-maven-plugin-markers"/>-->
-                                <!--<delete dir="target/org.eclipse.equinox.executable-3.5.0.v20110530-7P7NFUFFLWUl76mart"/>-->
-                                <!--<delete dir="target/p2-repo"/>-->
-                                <!--&lt;!&ndash; Figure out a way to delete tmp.* files &ndash;&gt;-->
-                                <!--<delete file="target/tmp"/>-->
-                                <!--<delete dir="target/carbon-analytics"/>-->
-                                <!--<delete dir="target/antrun"/>-->
                                 <delete dir="target/archive-tmp"/>
                                 <delete dir="target/dependency-maven-plugin-markers"/>
                                 <delete dir="target/org.eclipse.equinox.executable-3.5.0.v20110530-7P7NFUFFLWUl76mart"/>
                                 <delete dir="target/p2-repo"/>
+                                <!-- Figure out a way to delete tmp.* files -->
                                 <delete file="target/tmp"/>
-                                <delete dir="target/wso2carbon-kernel-${carbon.kernel.version}"/>
+                                <delete dir="target/carbon-analytics"/>
                                 <delete dir="target/antrun"/>
-                                <delete dir="target/maven-shared-archive-resources"/>
-                                <delete dir="target/findbugs"/>
-                                <delete file="target/checkstyle-cachefile"/>
-                                <delete file="target/checkstyle-checker.xml"/>
-                                <delete file="target/checkstyle-result.xml"/>
-                                <delete file="target/checkstyle-suppressions.xml"/>
                             </target>
                         </configuration>
                         <goals>