diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java
index b73387817..4836d3ca7 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetWizardController.java
@@ -150,8 +150,9 @@ public class DatasetWizardController extends BaseController {
         responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
 
         byte[] content = IOUtils.toByteArray(resource);
-        //Files.deleteIfExists(pdffile.toPath());
-        //Files.deleteIfExists(file.toPath());
+        resource.close();
+        Files.deleteIfExists(file.toPath());
+        Files.deleteIfExists(pdffile.toPath());
         return new ResponseEntity<>(content,
                 responseHeaders,
                 HttpStatus.OK);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
index afbf00276..535d5cade 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
@@ -285,6 +285,7 @@ public class DatasetManager {
         FileOutputStream output = new FileOutputStream(resultPdf);
         IOUtils.write(queueResult, output);
         output.close();
+        Files.deleteIfExists(file.toPath());
 
         return resultPdf;
     }