diff --git a/openair1/PHY/INIT/lte_init.c b/openair1/PHY/INIT/lte_init.c
index 36bb40f3475221acea54872b9692b9eb39a6bfd8..72c5d956295a05773985972c6ba47a9479cfc979 100644
--- a/openair1/PHY/INIT/lte_init.c
+++ b/openair1/PHY/INIT/lte_init.c
@@ -888,10 +888,8 @@ void phy_init_lte_top(LTE_DL_FRAME_PARMS *lte_frame_parms)
   ccodelte_init();
   ccodelte_init_inv();
 
-#ifndef EXPRESSMIMO_TARGET
   phy_generate_viterbi_tables();
   phy_generate_viterbi_tables_lte();
-#endif //EXPRESSMIMO_TARGET
 
   init_td8();
   init_td16();
diff --git a/openair1/PHY/TOOLS/cadd_sv.c b/openair1/PHY/TOOLS/cadd_sv.c
index 5cab789a68a8d01e5da45eb9c970a815b1b95d4b..1ca91b7969c714eab6f063d797b775388586e5df 100644
--- a/openair1/PHY/TOOLS/cadd_sv.c
+++ b/openair1/PHY/TOOLS/cadd_sv.c
@@ -28,7 +28,6 @@
  *******************************************************************************/
 #include "defs.h"
 
-#ifndef EXPRESSMIMO_TARGET
 static  __m128i alpha_128 __attribute__ ((aligned(16)));
 static  __m128i shift     __attribute__ ((aligned(16)));
 
@@ -169,17 +168,3 @@ main ()
 }
 
 #endif //MAIN
-
-
-#else //EXPRESSMIMO_TARGET
-
-int add_cpx_vector(short *x,
-                   short *alpha,
-                   short *y,
-                   unsigned int N)
-{
-
-}
-
-
-#endif //EXPRESSMIMO_TARGET
diff --git a/openair1/PHY/TOOLS/cadd_vv.c b/openair1/PHY/TOOLS/cadd_vv.c
index f369a659a9a8648a6710f0143c370dfec5f0127b..70ec37e50bfd9c63f9a6fef23700f1b629e32499 100644
--- a/openair1/PHY/TOOLS/cadd_vv.c
+++ b/openair1/PHY/TOOLS/cadd_vv.c
@@ -28,7 +28,6 @@
  *******************************************************************************/
 #include "defs.h"
 
-#ifndef EXPRESSMIMO_TARGET
 
 int add_vector16(short *x,
                  short *y,
@@ -286,17 +285,3 @@ main ()
 }
 
 #endif //MAIN
-
-#else //EXPRESSMIMO_TARGET
-
-/*
-int add_vector16(short *x,
-     short *y,
-     short *z,
-     unsigned int N)
-{
-
-}
-*/
-
-#endif // EXPRESSMIMO_TARGET
diff --git a/openair1/PHY/TOOLS/cmult_vvh.c b/openair1/PHY/TOOLS/cmult_vvh.c
index d5e299b724c4946a17ceb611d017ccb0a525722a..7e360d9728f28489f8fcff11de68d297291b71e1 100644
--- a/openair1/PHY/TOOLS/cmult_vvh.c
+++ b/openair1/PHY/TOOLS/cmult_vvh.c
@@ -28,7 +28,6 @@
  *******************************************************************************/
 #include "defs.h"
 
-#ifndef EXPRESSMIMO_TARGET
 static  __m128i shift __attribute__ ((aligned(16)));
 
 
@@ -365,15 +364,3 @@ main ()
 }
 
 #endif //MAIN
-
-#else //EXPRESSMIMO_TARGET
-int mult_cpx_vector_h(short *x1,
-                      short *x2,
-                      short *y,
-                      unsigned int N,
-                      unsigned short output_shift,
-                      short sign)
-{
-
-}
-#endif //EXPRESSMIMO_TARGET
diff --git a/openair1/PHY/TOOLS/defs.h b/openair1/PHY/TOOLS/defs.h
index 7d8942dd7237e309c73664fbfd32a23d3e9327c2..0ea1af57e4ffd6f3798b56a38c0284bbb08b32f1 100644
--- a/openair1/PHY/TOOLS/defs.h
+++ b/openair1/PHY/TOOLS/defs.h
@@ -64,7 +64,6 @@ struct complex32 {
   int32_t i;
 };
 
-#ifndef EXPRESSMIMO_TARGET
 /*!\fn void multadd_real_vector_complex_scalar(int16_t *x,int16_t *alpha,int16_t *y,uint32_t N)
 This function performs componentwise multiplication and accumulation of a complex scalar and a real vector.
 @param x Vector input (Q1.15)
@@ -480,20 +479,6 @@ Compensate the phase rotation of the RF. WARNING: This function is currently unu
 
 */
 
-#else // EXPRESSMIMO_TARGET
-
-#define fft(x,y,twiddle,rev,log2size,scale,input_fmt) \
-(((twiddle)==0) ? \
- (fft(1<<(log2size),((unsigned long*)(x)),((unsigned long*)(y)))) : \
- (ifft(1<<(log2size),((unsigned long*)(x)),((unsigned long*)(y)))))
-
-#define mult_cpx_vector(x1,x2,y,N,os)  component_wise_product(N,(unsigned long *)(x1),(unsigned long *)(x2),(unsigned long *)(y))
-
-#define mult_cpx_vector2(x1,x2,y,N,os)  component_wise_product(N,(unsigned long *)(x1),(unsigned long *)(x2),(unsigned long *)(y))
-
-#define add_vector16(x,y,z,N) component_wise_addition(N,(unsigned long*)(x),(unsigned long*)(y),(unsigned long*)(z))
-
-#endif // EXPRESSMIMO_TARGET
 
 int8_t dB_fixed(uint32_t x);
 
diff --git a/openair1/PHY/TOOLS/memory_routines.c b/openair1/PHY/TOOLS/memory_routines.c
index be938800785022f92665a39214575aa9e8b658cf..b4a4676a6dee606698cb3d9ecdff8a9d47c6124e 100755
--- a/openair1/PHY/TOOLS/memory_routines.c
+++ b/openair1/PHY/TOOLS/memory_routines.c
@@ -26,7 +26,6 @@
   Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
 
  *******************************************************************************/
-#ifndef EXPRESSMIMO_TARGET
 #include "PHY/sse_intrin.h"
 
 void Zero_Buffer(void *buf,unsigned int length)
@@ -63,12 +62,6 @@ void mmxcopy(void *dest,void *src,int size)
   _mm_empty();
 }
 
-#else //EXPRESSMIMO_TARGET
-
-
-
-#endif //EXPRESSMIMO_TARGET
-
 void Zero_Buffer_nommx(void *buf,unsigned int length)
 {