diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
index 412557706280e27045e6ecbcdb462a1887663306..06fd1af007b30cb2646f5abd300be3904283ef37 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
@@ -11,6 +11,10 @@ function checkVerifications() {
   getVerifications();
 }
 
+function cleanDmnVerifierRoot() {
+  $('#root-dmn-verifier').empty();
+}
+
 function getVerifications() {
   dmnModeler.saveXML({format: true}, function (err, xml) {
     if (err) {
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js
index a0beb7a56c28ae8b5983498cca8adc3cad3ee2bc..71e766c42110353ac8f5ca166e9eb60cfafceecc 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js
@@ -52,15 +52,7 @@ function exportDiagram() {
     } else {
       console.log('saving dmn..');
     }
-    $.ajax({
-      url: dmnApi + 'setCurrentDmn',
-      type: 'POST',
-      contentType: 'text/xml',
-      data: xml,
-      success: function (data) {
-        console.log('dmn saved');
-      }
-    });
+    // TODO, download
   });
 }
 
@@ -70,6 +62,8 @@ function exportDiagram() {
  * @param {String} dmnXML diagram to display
  */
 function openDiagram(dmnXML) {
+  // clean
+  cleanDmnVerifierRoot();
   // import diagram
   dmnModeler.importXML(dmnXML, function (err) {
     if (err) {
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/upload.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/upload.js
index 14b4cb9681424f70134452a8854580d8c7b7cf71..9cdc772b5acab39645c8fc5c4efa6fd460ca1d15 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/upload.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/upload.js
@@ -1,18 +1,13 @@
-console.log("TEST");
-
 document.addEventListener("DOMContentLoaded", function () {
-  // Falls neue Eingabe, neuer Aufruf der Auswahlfunktion
-  document.getElementById('dmn-file-upload').addEventListener('change',
-      loadDmnFromFile,
-      false);
+  $('#dmn-file-upload').on('change', loadDmnFromFile);
 });
 
 function loadDmnFromFile(evt) {
-  var files = evt.target.files;
-  var dmnFile = files[0];
-  var fileReader = new FileReader();
+  let files = evt.target.files;
+  let dmnFile = files[0];
+  let fileReader = new FileReader();
   fileReader.onload = function (fileLoadedEvent) {
-    var textFromFileLoaded = fileLoadedEvent.target.result;
+    let textFromFileLoaded = fileLoadedEvent.target.result;
     openDiagram(textFromFileLoaded);
   };
   fileReader.readAsText(dmnFile, "UTF-8");