diff --git a/features/org.eclipse.papyrus.moka.feature/feature.xml b/features/org.eclipse.papyrus.moka.feature/feature.xml
index 93a969b..6d2beda 100644
--- a/features/org.eclipse.papyrus.moka.feature/feature.xml
+++ b/features/org.eclipse.papyrus.moka.feature/feature.xml
@@ -294,5 +294,47 @@
          download-size="0"
          install-size="0"
          version="0.0.0"/>
+         
+           <plugin
+         id="org.eclipse.papyrus.moka.trace"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.moka.trace.model.editor"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.moka.tracepoint.service"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.moka.ui.tracepoint.view"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.moka.trace.interfaces"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.moka.trace.model.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.papyrus.moka.trace.model"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
 </feature>
diff --git a/features/org.eclipse.papyrus.moka.trace.feature/.project b/features/org.eclipse.papyrus.moka.trace.feature/.project
deleted file mode 100644
index 4ea65ae..0000000
--- a/features/org.eclipse.papyrus.moka.trace.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.moka.trace.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.papyrus.moka.trace.feature/build.properties b/features/org.eclipse.papyrus.moka.trace.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.eclipse.papyrus.moka.trace.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.papyrus.moka.trace.feature/feature.xml b/features/org.eclipse.papyrus.moka.trace.feature/feature.xml
deleted file mode 100644
index de7416d..0000000
--- a/features/org.eclipse.papyrus.moka.trace.feature/feature.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.papyrus.moka.trace.feature"
-      label="Moka Trace Service"
-      version="4.1.0.qualifier"
-      provider-name="CEA LIST">
-
-   <description>
-      Providing trace generation service.
-   </description>
-
-   <copyright>
-Copyright (c) 2018 CEA LIST.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License 2.0\n\
-which accompanies this distribution, and is available at\n\
-https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n
-   </copyright>
-
-   <license>
-      [Enter License Description here.]
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.papyrus.moka.feature" version="4.0.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.papyrus.moka.trace"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.papyrus.moka.trace.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.moka.trace.model.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.papyrus.moka.tracepoint.service"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.papyrus.moka.ui.tracepoint.view"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.papyrus.moka.trace.interfaces"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.papyrus.moka.trace.model.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.papyrus.moka.trace.model"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.papyrus.moka.trace.feature/pom.xml b/features/org.eclipse.papyrus.moka.trace.feature/pom.xml
deleted file mode 100644
index b97f31a..0000000
--- a/features/org.eclipse.papyrus.moka.trace.feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<!-- Parent POM (i.e., POM located in the feature folder) -->
-	<parent>
-		<groupId>org.eclipse.papyrus.moka</groupId>
-		<artifactId>org.eclipse.papyrus.moka.features</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
-	</parent>
-
-	<!-- POM description -->
-	<artifactId>org.eclipse.papyrus.moka.trace.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-	<name>Moka Trace Service Feature</name>
-
-</project>
\ No newline at end of file
diff --git a/features/pom.xml b/features/pom.xml
index b5d35de..e7de5e8 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -18,7 +18,6 @@
 	<!-- Modules to build -->
 	<modules>
 		<module>org.eclipse.papyrus.moka.feature</module>
-		<module>org.eclipse.papyrus.moka.trace.feature</module>
 	</modules>
 	
 </project>
diff --git a/releng/org.eclipse.papyrus.moka.p2/category.xml b/releng/org.eclipse.papyrus.moka.p2/category.xml
index 521790e..099d84a 100644
--- a/releng/org.eclipse.papyrus.moka.p2/category.xml
+++ b/releng/org.eclipse.papyrus.moka.p2/category.xml
@@ -6,12 +6,6 @@
    <feature url="features/org.eclipse.papyrus.moka.feature.source_4.1.0.qualifier.jar" id="org.eclipse.papyrus.moka.feature.source" version="4.1.0.qualifier">
       <category name="org.eclipse.papyrus.moka.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.moka.trace.feature_4.1.0.qualifier.jar" id="org.eclipse.papyrus.moka.trace.feature" version="4.1.0.qualifier">
-      <category name="org.eclipse.papyrus.moka.category"/>
-   </feature>
-   <feature url="features/org.eclipse.papyrus.moka.trace.feature.source_4.1.0.qualifier.jar" id="org.eclipse.papyrus.moka.trace.feature.source" version="4.1.0.qualifier">
-      <category name="org.eclipse.papyrus.moka.category"/>
-   </feature>
    <category-def name="org.eclipse.papyrus.moka.category" label="Moka">
       <description>
          Papyrus Model Execution Tool