diff --git a/conf/java-opts.template b/conf/java-opts.template
index b61e8163b57ef77ebb9a228bb09016bedfe66714..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/conf/java-opts.template
+++ b/conf/java-opts.template
@@ -1 +0,0 @@
--Dspark.broadcast.masterHostAddress=127.0.0.1 -Dspark.broadcast.masterTrackerPort=11111 -Dspark.broadcast.blockSize=1024 -Dspark.broadcast.maxRetryCount=2 -Dspark.broadcast.serverSocketTimout=50000 -Dspark.broadcast.dualMode=false
diff --git a/conf/spark-env.sh.template b/conf/spark-env.sh.template
index 77f9cb69b96724905aa065203238b22e9121d454..6852b23a3426fd51ef78402c532a72d34f306cc3 100755
--- a/conf/spark-env.sh.template
+++ b/conf/spark-env.sh.template
@@ -10,4 +10,4 @@
 #   be in the same format as the JVM's -Xmx option, e.g. 300m or 1g).
 # - SPARK_LIBRARY_PATH, to add extra search paths for native libraries.
 
-MESOS_HOME=/home/mosharaf/Work/mesos
+
diff --git a/src/scala/spark/Broadcast.scala b/src/scala/spark/Broadcast.scala
index 105aa3483e4387b49cfa512cd6db5ea7cfa4c96d..df7ab3f19f5c3108621d40927871bff4c9361063 100644
--- a/src/scala/spark/Broadcast.scala
+++ b/src/scala/spark/Broadcast.scala
@@ -223,7 +223,7 @@ private object Broadcast {
         // Initialization for CentralizedHDFSBroadcast
         BroadcastCH.initialize 
         // Initialization for ChainedStreamingBroadcast
-        BroadcastCS.initialize (isMaster)
+        // BroadcastCS.initialize (isMaster)
         
         initialized = true
       }