diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 001d14add25b96457d5eec265debffc31761d965..b36beb035f419c5300dcc060a09cf6992565ea7d 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -633,7 +633,6 @@ add_boolean_option(OPENAIR1                True "????")
 add_boolean_option(PHYSIM                  True  "for L1 simulators (dlsim, ulsim, ...)")
 add_boolean_option(PHY_CONTEXT             True "not clear: must remain False for dlsim")
 add_boolean_option(PHY_EMUL                False "not clear: must remain False for dlsim")
-add_boolean_option(PUCCH                   True "????")
 add_boolean_option(SMBV                    False "Rohde&Schwarz SMBV100A vector signal generator")
 add_boolean_option(DEBUG_PHY               False "Enable PHY layer debugging options")
 add_boolean_option(DEBUG_PHY_PROC          False "Enable debugging of PHY layer procedures")
diff --git a/cmake_targets/epc_test/CMakeLists.template b/cmake_targets/epc_test/CMakeLists.template
index aec0caaa3bb94e56fd18623914d864f3c4ae0426..35d478828bb8305800ad6b4528dd11df614e88cf 100644
--- a/cmake_targets/epc_test/CMakeLists.template
+++ b/cmake_targets/epc_test/CMakeLists.template
@@ -52,7 +52,6 @@ set (  PDCP_MSG_PRINT False )
 set (  PHY_CONTEXT False )
 set (  PHY_EMUL False )
 set (  PHYSIM True )
-set (  PUCCH True )
 set (  RF_BOARD "False" )
 set (  RLC_STOP_ON_LOST_PDU False )
 set (  RRC_ASN1_VERSION "Rel10" )
diff --git a/cmake_targets/oaisim_build_oai/CMakeLists.template b/cmake_targets/oaisim_build_oai/CMakeLists.template
index 4df8056c6eec6bfa360d059d35857fc697de1951..20863eeab5d56c15a9402ca69a601ff9c74daaab 100644
--- a/cmake_targets/oaisim_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_build_oai/CMakeLists.template
@@ -51,7 +51,6 @@ set (  PDCP_MSG_PRINT False )
 set (  PHY_CONTEXT False )
 set (  PHY_EMUL False )
 set (  PHYSIM True )
-set (  PUCCH True )
 set (  RF_BOARD "False" )
 set (  RLC_STOP_ON_LOST_PDU False )
 set (  RRC_ASN1_VERSION "Rel10" )
diff --git a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
index 618468d295225283f7803c07dfb3a55f59819111..9ce736d8189ed1c31c999cb47bb7122bd0174b86 100644
--- a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
@@ -52,7 +52,6 @@ set (  PDCP_MSG_PRINT False )
 set (  PHY_CONTEXT False )
 set (  PHY_EMUL False )
 set (  PHYSIM False )
-set (  PUCCH False )
 set (  RF_BOARD "False" )
 set (  RRC_ASN1_VERSION "Rel10" )
 set (  RLC_STOP_ON_LOST_PDU False )
diff --git a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
index dec2f7b277e0ae562a65ab0b2c6ade21f069bd52..6dd0f2ffca18ba1d18f1395a7731be89a0cec62a 100644
--- a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
@@ -53,7 +53,6 @@ set (  PDCP_MSG_PRINT False )
 set (  PHY_CONTEXT False )
 set (  PHY_EMUL False )
 set (  PHYSIM True )
-set (  PUCCH True )
 set (  RF_BOARD "False" )
 set (  RRC_ASN1_VERSION "Rel10" )
 set (  RLC_STOP_ON_LOST_PDU False )
diff --git a/cmake_targets/s1c_mme_test/CMakeLists.template b/cmake_targets/s1c_mme_test/CMakeLists.template
index c9ef0ec3f2ce618d920e352db6d2a46a7c6e2809..cf5e6b241b0687a5ef7c21373707606fe32c3f04 100644
--- a/cmake_targets/s1c_mme_test/CMakeLists.template
+++ b/cmake_targets/s1c_mme_test/CMakeLists.template
@@ -52,7 +52,6 @@ set (  PDCP_MSG_PRINT False )
 set (  PHY_CONTEXT False )
 set (  PHY_EMUL False )
 set (  PHYSIM True )
-set (  PUCCH True )
 set (  RF_BOARD "False" )
 set (  RLC_STOP_ON_LOST_PDU False )
 set (  RRC_ASN1_VERSION "Rel10" )
diff --git a/common/utils/telnetsrv/CMakeLists.txt b/common/utils/telnetsrv/CMakeLists.txt
index 0fb0dbe78f0dcaf114e96f03d82e79a3d5c1c282..ee58aaec9354292822ebc96325a8d70f2323a494 100644
--- a/common/utils/telnetsrv/CMakeLists.txt
+++ b/common/utils/telnetsrv/CMakeLists.txt
@@ -24,7 +24,7 @@ set(OPENAIR_NFAPIINC $ENV{NFAPI_DIR} )
 
 set(CMAKE_INSTALL_PREFIX $ENV{OPENAIR_TARGETS})
 
-add_definitions (-DRel14  -DCMAKER -DENABLE_ITTI -DENABLE_NAS_UE_LOGGING -DENABLE_SECURITY  -DENABLE_USE_CPU_EXECUTION_TIME  -DENABLE_USE_MME -DENABLE_VCD -DENB_AGENT -DENB_MODE -DETHERNET=1  -DEXMIMO_IOT -DJUMBO_FRAME  -DLINK_ENB_PDCP_TO_GTPV1U -DLOG_NO_THREAD -DMAC_CONTEXT -DMAX_NUM_CCs=1  -DNAS_BUILT_IN_UE -DNAS_UE  -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX=2 -DNO_RRM -DNone=1 -DOAI_NW_DRIVER_USE_NETLINK  -DOPENAIR1 -DOPENAIR2  -DOPENAIR_LTE -DPHYSIM  -DPHY_CONTEXT -DPUCCH -DRel10=1  -DS1AP_VERSION=R10   -DTRACE_RLC_MUTEX -DX2AP_VERSION=R11 -DXFORMS -mavx2 -msse4.1 -mssse3)
+add_definitions (-DRel14  -DCMAKER -DENABLE_ITTI -DENABLE_NAS_UE_LOGGING -DENABLE_SECURITY  -DENABLE_USE_CPU_EXECUTION_TIME  -DENABLE_USE_MME -DENABLE_VCD -DENB_AGENT -DENB_MODE -DETHERNET=1  -DEXMIMO_IOT -DJUMBO_FRAME  -DLINK_ENB_PDCP_TO_GTPV1U -DLOG_NO_THREAD -DMAC_CONTEXT -DMAX_NUM_CCs=1  -DNAS_BUILT_IN_UE -DNAS_UE  -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TX=2 -DNB_ANTENNAS_TXRX=2 -DNO_RRM -DNone=1 -DOAI_NW_DRIVER_USE_NETLINK  -DOPENAIR1 -DOPENAIR2  -DOPENAIR_LTE -DPHYSIM  -DPHY_CONTEXT -DRel10=1  -DS1AP_VERSION=R10   -DTRACE_RLC_MUTEX -DX2AP_VERSION=R11 -DXFORMS -mavx2 -msse4.1 -mssse3)
 add_compile_options( -fPIC -march=native -Ofast)
 
 include_directories( ./ ${OPENAIR_COMMON_DIR} ${OPENAIR_DIR} ${OPENAIR1_DIR} ${OPENAIR2_DIR} ${OPENAIR2_COMMON_DIR} ${OPENAIR2_DIR}/UTIL/LOG 
diff --git a/targets/SIMU/USER/Makefile b/targets/SIMU/USER/Makefile
index 49127cf25dd375fbb2444ba1065de72b77186336..ba81d0e6a751d70112f9384a10e8d8130f1ac21f 100644
--- a/targets/SIMU/USER/Makefile
+++ b/targets/SIMU/USER/Makefile
@@ -33,7 +33,7 @@ CFLAGS += -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 $(CPUFLAGS)
 
 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
 
-CFLAGS += -DOPENAIR_LTE -DPUCCH #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
+CFLAGS += -DOPENAIR_LTE #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
 CFLAGS += -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 #-DRLC_UM_TEST_TRAFFIC=1
 #CFLAGS += -DLLR8
 CFLAGS += -DPACKAGE_NAME='"oaisim"'
diff --git a/targets/TEST/PACKET_TRACER/Makefile b/targets/TEST/PACKET_TRACER/Makefile
index 53efdae1e59d0da99410705c2115385eb6d8496f..7b857ca3b97c6cacb9d36ec80e50b6a06d0307a1 100755
--- a/targets/TEST/PACKET_TRACER/Makefile
+++ b/targets/TEST/PACKET_TRACER/Makefile
@@ -10,7 +10,7 @@ CFLAGS += -m32 -DPHYSIM -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX
 
 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
 
-CFLAGS += -DOPENAIR_LTE -DPUCCH #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE  
+CFLAGS += -DOPENAIR_LTE #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE  
 CFLAGS += -DMAC_CONTEXT=1 -DPHY_CONTEXT=1
 CFLAGS += -DEMIT_ASN_DEBUG=1
 ifndef OPENAIR2
diff --git a/targets/TEST/RLC_AM_V9.3.0/Makefile b/targets/TEST/RLC_AM_V9.3.0/Makefile
index dcbea8590951551cd64cabedd71936e6f7474636..dde20a7b4252cb75a3d492a10db5fc7e40ebcdba 100755
--- a/targets/TEST/RLC_AM_V9.3.0/Makefile
+++ b/targets/TEST/RLC_AM_V9.3.0/Makefile
@@ -12,7 +12,7 @@ CFLAGS += -m32 -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -I/usr
 
 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
 
-CFLAGS += -DOPENAIR_LTE -DPUCCH #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
+CFLAGS += -DOPENAIR_LTE #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
 CFLAGS += -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 #-DRLC_UM_TEST_TRAFFIC=1
 #CFLAGS += -DLLR8
 
diff --git a/targets/TEST/RLC_UM_V9.3.0/Makefile b/targets/TEST/RLC_UM_V9.3.0/Makefile
index dc4d0de16d4d98ba33b5ce3152f0cffafa7078b9..57002dad21b032f9a6db4fe1c0efcb5f21047f75 100755
--- a/targets/TEST/RLC_UM_V9.3.0/Makefile
+++ b/targets/TEST/RLC_UM_V9.3.0/Makefile
@@ -12,7 +12,7 @@ CFLAGS += -m32 -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -I/usr
 
 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
 
-CFLAGS += -DOPENAIR_LTE -DPUCCH #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
+CFLAGS += -DOPENAIR_LTE #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE
 CFLAGS += -DMAC_CONTEXT=1 -DPHY_CONTEXT=1 #-DRLC_UM_TEST_TRAFFIC=1
 #CFLAGS += -DLLR8