diff --git a/make.config b/make.config
index 9a4c152..504ffba 100644
--- a/make.config
+++ b/make.config
@@ -2,11 +2,8 @@
 
 ## ALIGNMENT
 
-CPU_TYPE=-axSSSE3,SSE4.2,AVX,CORE-AVX2   # [ CORE-AVX2 | CORE-AVX-I | AVX | SSE4.2 ]
-#CPU_TYPE="-axCORE-AVX2,SSE4.2,SSE2" # [ CORE-AVX2 | CORE-AVX-I | AVX | SSE4.2 ]
-#CPU_TYPE="-xAVX" # [ CORE-AVX2 | CORE-AVX-I | AVX | SSE4.2 ]
-#CPU_TYPE="-xCORE-AVX2" # [ CORE-AVX2 | CORE-AVX-I | AVX | SSE4.2 ]
-#CPU_TYPE="-xSSE4.2" # [ CORE-AVX2 | CORE-AVX-I | AVX | SSE4.2 ]
+#CPU_TYPE="-xCORE-AVX2" # [ Host | CORE-AVX2 | CORE-AVX-I | AVX | SSE4.2 ]
+CPU_TYPE="-xHost" 
 
 # Array alignment (Bytes)
 ALIGN="32"
diff --git a/src/ZMQ/qmc.irp.f b/src/ZMQ/qmc.irp.f
index d3f1712..3363808 100644
--- a/src/ZMQ/qmc.irp.f
+++ b/src/ZMQ/qmc.irp.f
@@ -61,7 +61,6 @@ subroutine run_qmc(cpu0)
  implicit none
  include '../types.F'
  include '../deriv_var.F'
- include '../deriv_ene.F'
  
  integer*8                      :: cpu0
  integer                        :: isize, i, j, ierr
@@ -106,8 +105,7 @@ subroutine run_qmc(cpu0)
 BEGIN_SHELL [ /usr/bin/python ]
 from properties import *
 
-derivlist = map(lambda x: x[1], properties)
-derivlist = filter(lambda x: x.startswith("d_var_"), derivlist)
+derivlist = []
 
 td = """
      do j=0,size($X_block_walk,1)-1,7