diff --git a/minicluster/src/main/java/tachyon/master/LocalTachyonCluster.java b/minicluster/src/main/java/tachyon/master/LocalTachyonCluster.java
index <HASH>..<HASH> 100644
--- a/minicluster/src/main/java/tachyon/master/LocalTachyonCluster.java
+++ b/minicluster/src/main/java/tachyon/master/LocalTachyonCluster.java
@@ -388,6 +388,7 @@ public final class LocalTachyonCluster {
     if (mUfsCluster != null) {
       mUfsCluster.cleanup();
     }
+    // TODO(gpang): is this line necessary?
     System.clearProperty("tachyon.underfs.address");
   }
Add todo for investigating system property clearing