diff --git a/driver/opae/Makefile b/driver/opae/Makefile
index 34991e2f..b13b897d 100644
--- a/driver/opae/Makefile
+++ b/driver/opae/Makefile
@@ -18,10 +18,7 @@ CXXFLAGS +=-fstack-protector
 CXXFLAGS += -fPIC
 
 # Enable scope analyzer
-CXXFLAGS += -DSCOPE
-
-# config parameters
-CXXFLAGS += -DNUM_WARPS=2 -DNUM_THREADS=2
+#CXXFLAGS += -DSCOPE
 
 LDFLAGS += -luuid
 
diff --git a/driver/rtlsim/Makefile b/driver/rtlsim/Makefile
index 7e9761ff..0bad8c20 100644
--- a/driver/rtlsim/Makefile
+++ b/driver/rtlsim/Makefile
@@ -13,15 +13,14 @@ DBG_PRINT_FLAGS = -DDBG_PRINT_CORE_ICACHE \
 				  -DDBG_PRINT_WB          \
 				  -DDBG_PRINT_OPAE
 
-DBG_PRINT=$(DBG_PRINT_FLAGS)
+#DBG_PRINT=$(DBG_PRINT_FLAGS)
 
 #CONFIGS += -DNUM_CLUSTERS=2 -DNUM_CORES=4
 #CONFIGS += -DNUM_CLUSTERS=1 -DNUM_CORES=4
 #CONFIGS += -DNUM_CLUSTERS=1 -DNUM_CORES=2
-CONFIGS += -DNUM_WARPS=2 -DNUM_THREADS=2
 
-DEBUG=1
-AFU=1
+#DEBUG=1
+#AFU=1
 
 CFLAGS += -fPIC
 
diff --git a/driver/tests/basic/Makefile b/driver/tests/basic/Makefile
index 19277f92..6a753d87 100644
--- a/driver/tests/basic/Makefile
+++ b/driver/tests/basic/Makefile
@@ -44,16 +44,16 @@ $(PROJECT): $(SRCS)
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -L../../stub -lvortex -o $@
 
 run-fpga: $(PROJECT)
-	LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) -n 32
+	LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) -n 256
 
 run-ase: $(PROJECT)
-	ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) -n 16
+	ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) -n 256
 
 run-rtlsim: $(PROJECT)
-	LD_LIBRARY_PATH=../../rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) -n 16
+	LD_LIBRARY_PATH=../../rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) -n 256
 
 run-simx: $(PROJECT)
-	LD_LIBRARY_PATH=../../simx:$(LD_LIBRARY_PATH) ./$(PROJECT) -n 16
+	LD_LIBRARY_PATH=../../simx:$(LD_LIBRARY_PATH) ./$(PROJECT) -n 256
 
 .depend: $(SRCS)
 	$(CXX) $(CXXFLAGS) -MM $^ > .depend;
diff --git a/hw/opae/sources.txt b/hw/opae/sources.txt
index 226f89f2..be3eb67e 100644
--- a/hw/opae/sources.txt
+++ b/hw/opae/sources.txt
@@ -2,10 +2,7 @@ vortex_afu.json
 
 QI:vortex_afu.qsf
 
-+define+SCOPE
-
-+define+NUM_WARPS=2
-+define+NUM_THREADS=2
+#+define+SCOPE
 
 #+define+DBG_PRINT_CORE_ICACHE
 #+define+DBG_PRINT_CORE_DCACHE