diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-backend/pom.xml b/kie-wb-common-dmn/kie-wb-common-dmn-backend/pom.xml
index ecdc24b520a..9daf8d9e2e4 100644
--- a/kie-wb-common-dmn/kie-wb-common-dmn-backend/pom.xml
+++ b/kie-wb-common-dmn/kie-wb-common-dmn-backend/pom.xml
@@ -85,26 +85,6 @@
       <artifactId>kie-wb-common-dmn-api</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.kie.workbench.forms</groupId>
-      <artifactId>kie-wb-common-forms-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.workbench.forms</groupId>
-      <artifactId>kie-wb-common-dynamic-forms-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.workbench.forms</groupId>
-      <artifactId>kie-wb-common-dynamic-forms-backend</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.kie.workbench.forms</groupId>
-      <artifactId>kie-wb-common-forms-adf-base</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.jboss.errai</groupId>
       <artifactId>errai-bus</artifactId>
@@ -172,17 +152,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.jboss.errai</groupId>
-      <artifactId>errai-javax-enterprise</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-
     <!-- TODO {manstis} This is temporary until DMNMarshaller is fully implemented -->
     <dependency>
       <groupId>org.jboss.errai</groupId>
diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-common/pom.xml b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-common/pom.xml
index f983d2cf040..5715001d695 100644
--- a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-common/pom.xml
+++ b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-common/pom.xml
@@ -36,12 +36,6 @@
 
   <dependencies>
 
-    <!--Logs-->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-
     <!-- MANSTIS - EVERYTHING BELOW THIS HAS BEEN _SANITISED_! -->
 
     <!-- Errai -->
@@ -71,10 +65,6 @@
       <groupId>org.kie.workbench.stunner</groupId>
       <artifactId>kie-wb-common-stunner-client-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.kie.workbench.stunner</groupId>
-      <artifactId>kie-wb-common-stunner-backend-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.kie.workbench.stunner</groupId>
       <artifactId>kie-wb-common-stunner-core-common</artifactId>
@@ -141,20 +131,10 @@
       <groupId>org.uberfire</groupId>
       <artifactId>uberfire-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.uberfire</groupId>
-      <artifactId>uberfire-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.uberfire</groupId>
       <artifactId>uberfire-client-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.uberfire</groupId>
-      <artifactId>uberfire-client-backend</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.uberfire</groupId>
       <artifactId>uberfire-workbench-client-views-patternfly</artifactId>
@@ -167,13 +147,6 @@
       <artifactId>elemental2-promise</artifactId>
     </dependency>
 
-    <!-- Needed for the ACE XML Editor -->
-    <dependency>
-      <groupId>org.uberfire</groupId>
-      <artifactId>uberfire-widgets-core-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
     <!-- UberFire IO -->
     <dependency>
       <groupId>org.uberfire</groupId>
@@ -234,12 +207,6 @@
       <groupId>com.google.gwt</groupId>
       <artifactId>gwt-user</artifactId>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>javax.servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.gwtbootstrap3</groupId>
diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/DMNMarshaller.gwt.xml b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/DMNMarshaller.gwt.xml
index acf72615565..b7abf44c651 100644
--- a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/DMNMarshaller.gwt.xml
+++ b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/DMNMarshaller.gwt.xml
@@ -29,9 +29,7 @@
   <set-property name="user.agent" value="gecko1_8,safari"/>
 
   <!-- Specify the paths for translatable code -->
-  <source path="js">
-    <exclude name="jre"/>
-  </source>
+  <source path="js"/>
   <source path="mapper"/>
 
   <super-source path="jre"/>
diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/javax/xml/XMLConstants.java b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/javax/xml/XMLConstants.java
similarity index 100%
rename from kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/javax/xml/XMLConstants.java
rename to kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/javax/xml/XMLConstants.java
diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/javax/xml/namespace/QName.java b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/javax/xml/namespace/QName.java
similarity index 86%
rename from kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/javax/xml/namespace/QName.java
rename to kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/javax/xml/namespace/QName.java
index 1a948e16fdd..38916c926dd 100644
--- a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/javax/xml/namespace/QName.java
+++ b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/javax/xml/namespace/QName.java
@@ -99,7 +99,7 @@ public String toString() {
     }
 
     /**
-     * See {@link javax.xml.namespace.QName#equals(Object)}
+     * See {@link QName#equals(Object)}
      */
     @Override
     public boolean equals(final Object o) {
@@ -117,7 +117,7 @@ public boolean equals(final Object o) {
     }
 
     /**
-     * See {@link javax.xml.namespace.QName#hashCode()}
+     * See {@link QName#hashCode()}
      */
     @Override
     public int hashCode() {
@@ -134,16 +134,16 @@ public static QName valueOf(final String qNameAsString) {
 
         // "" local part is valid to preserve compatible behavior with QName 1.0
         if (qNameAsString.length() == 0) {
-            return new javax.xml.namespace.QName(XMLConstants.NULL_NS_URI,
-                                                 qNameAsString,
-                                                 XMLConstants.DEFAULT_NS_PREFIX);
+            return new QName(XMLConstants.NULL_NS_URI,
+                             qNameAsString,
+                             XMLConstants.DEFAULT_NS_PREFIX);
         }
 
         // local part only?
         if (qNameAsString.charAt(0) != '{') {
-            return new javax.xml.namespace.QName(XMLConstants.NULL_NS_URI,
-                                                 qNameAsString,
-                                                 XMLConstants.DEFAULT_NS_PREFIX);
+            return new QName(XMLConstants.NULL_NS_URI,
+                             qNameAsString,
+                             XMLConstants.DEFAULT_NS_PREFIX);
         }
 
         // Namespace URI improperly specified?
@@ -164,8 +164,8 @@ public static QName valueOf(final String qNameAsString) {
                                                        + qNameAsString
                                                        + "\", missing closing \"}\"");
         }
-        return new javax.xml.namespace.QName(qNameAsString.substring(1, endOfNamespaceURI),
-                                             qNameAsString.substring(endOfNamespaceURI + 1),
-                                             XMLConstants.DEFAULT_NS_PREFIX);
+        return new QName(qNameAsString.substring(1, endOfNamespaceURI),
+                         qNameAsString.substring(endOfNamespaceURI + 1),
+                         XMLConstants.DEFAULT_NS_PREFIX);
     }
 }
diff --git a/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/package-info.java b/kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/package-info.java
similarity index 100%
rename from kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/java/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/package-info.java
rename to kie-wb-common-dmn/kie-wb-common-dmn-webapp-kogito-marshaller/src/main/resources/org/kie/workbench/common/dmn/webapp/kogito/marshaller/jre/package-info.java