diff --git a/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java b/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java
index e3167e4..fb8e099 100644
--- a/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java
+++ b/java/src/main/java/ca/uwaterloo/cs489/exercise2/Job.java
@@ -24,12 +24,18 @@ public int processJob() {
       return 1;
     }
 
-    for (int i = input-1; i > 1; i--) {
+    for (int i = input - 1; i > 1; i--) {
       rtn *= i;
     }
 
     return rtn;
   }
 
-  public int getInput() { return this.input; }
+  public boolean deleteJob() {
+    return this.file.delete();
+  }
+
+  public int getInput() {
+    return this.input;
+  }
 }
diff --git a/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java b/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java
index c699133..78a6707 100644
--- a/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java
+++ b/java/src/main/java/ca/uwaterloo/cs489/exercise2/MainApp.java
@@ -4,16 +4,18 @@
 import java.io.InputStreamReader;
 import java.io.IOException;
 import java.io.FileNotFoundException;
+import java.io.File;
 
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Comparator;
+import java.util.stream.Stream;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-
 public class MainApp {
 
   private static Path getDirectory() throws IOException {
@@ -35,7 +37,20 @@ public static void main(String[] args) {
       for (Path entry : ds) {
         Job job = new Job(entry.toFile());
         logger.info(String.format("Job %d yields %d\n", job.getInput(), job.processJob()));
+        if (job.deleteJob()) {
+          logger.info(String.format("Job %d deleted successfully\n", job.getInput()));
+        } else {
+          logger.info(String.format("Job %d failed to delete\n", job.getInput()));
+        }
       }
+      // delete directory
+      Stream<Path> walk = Files.walk(dir);
+      walk.sorted(Comparator.reverseOrder())
+          .map(Path::toFile)
+          .peek(System.out::println)
+          .forEach(File::delete);
+      walk.close();
+      logger.info(String.format("Directory %s deleted successfully\n", dir.toString()));
     } catch (IOException e) {
       e.printStackTrace();
     }