diff --git a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
index c881561..1b6efbe 100644
--- a/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
+++ b/pregelix/pregelix-core/src/main/java/edu/uci/ics/pregelix/core/driver/Driver.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.UUID;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -35,13 +36,10 @@
 @SuppressWarnings("rawtypes")
 public class Driver implements IDriver {
     private static final Log LOG = LogFactory.getLog(Driver.class);
-    private static String LIB = "lib";
     private JobGen jobGen;
-    private PregelixJob job;
     private boolean profiling;
 
     private String applicationName;
-    private String PREGELIX_HOME = "PREGELIX_HOME";
     private IHyracksClientConnection hcc;
 
     private Class exampleClass;
@@ -53,6 +51,7 @@
     @Override
     public void runJob(PregelixJob job, Plan planChoice, String ipAddress, int port, boolean profiling)
             throws HyracksException {
+        applicationName = exampleClass.getSimpleName() + UUID.randomUUID();
         /** add hadoop configurations */
         URL hadoopCore = job.getClass().getClassLoader().getResource("core-site.xml");
         job.getConfiguration().addResource(hadoopCore);
@@ -66,7 +65,6 @@
         long end = start;
         long time = 0;
 
-        this.job = job;
         this.profiling = profiling;
         try {
             switch (planChoice) {
