diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index f13d56468af7e528048a655cba7654af9ac8acbd..1540bb56c9d654eb8382256d04b8fd17e5e17e25 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -631,7 +631,6 @@ add_integer_option(MAX_NUM_CCs             1     "????")
 add_boolean_option(MU_RECEIVER             False "????")
 add_boolean_option(NEW_FFT                 True "????")
 add_boolean_option(OPENAIR1                True "????")
-add_boolean_option(PC_DSP                  True "????")
 add_boolean_option(PC_TARGET               True "????")
 add_boolean_option(PERFECT_CE              False "????")
 add_boolean_option(PHYSIM                  True  "for L1 simulators (dlsim, ulsim, ...)")
diff --git a/cmake_targets/epc_test/CMakeLists.template b/cmake_targets/epc_test/CMakeLists.template
index 6aab75b8969de095937119f3eec77db94ab88e21..14b58623202618970c231aaaa374f3df5ebe8177 100644
--- a/cmake_targets/epc_test/CMakeLists.template
+++ b/cmake_targets/epc_test/CMakeLists.template
@@ -49,7 +49,6 @@ set (  OPENAIR2 True )
 set (  OPENAIR_LTE True )
 set (  PACKAGE_NAME "epc_test" )
 set (  PDCP_USE_NETLINK True )
-set (  PC_DSP True )
 set (  PC_TARGET True )
 set (  PDCP_MSG_PRINT False )
 set (  PERFECT_CE False )
diff --git a/cmake_targets/oaisim_build_oai/CMakeLists.template b/cmake_targets/oaisim_build_oai/CMakeLists.template
index a91402cdfc35ba697b1a8f41588cf03e56d55269..b600f6f616304fe6a6c826339bbd9c74b39d30b1 100644
--- a/cmake_targets/oaisim_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_build_oai/CMakeLists.template
@@ -48,7 +48,6 @@ set (  OPENAIR2 True )
 set (  OPENAIR_LTE True )
 set (  PACKAGE_NAME "oaisim" )
 set (  PDCP_USE_NETLINK True )
-set (  PC_DSP True )
 set (  PC_TARGET True )
 set (  PDCP_MSG_PRINT False )
 set (  PERFECT_CE False )
diff --git a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
index 9419da532cbfe030e1d0db2d4ec6ee6d680f8ed1..fe398b9275f3abb39077510d34a72939622bb808 100644
--- a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
@@ -49,7 +49,6 @@ set (  OPENAIR2 False )
 set (  OPENAIR_EMU False )
 set (  OPENAIR_LTE False )
 set (  PACKAGE_NAME "EPC" )
-set (  PC_DSP False )
 set (  PC_TARGET False )
 set (  PDCP_MSG_PRINT False )
 set (  PERFECT_CE False )
diff --git a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
index 9cc3e74fdd9c6301fccb80f2f8a44ec1311b7823..7d0b5b0268746babb7f742b245b7c86d2188e0cf 100644
--- a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
@@ -50,7 +50,6 @@ set (  OPENAIR_EMU False )
 set (  OPENAIR_LTE True )
 set (  PACKAGE_NAME "oaisim" )
 set (  PDCP_USE_NETLINK True )
-set (  PC_DSP True )
 set (  PC_TARGET True )
 set (  PDCP_MSG_PRINT False )
 set (  PERFECT_CE False )
diff --git a/cmake_targets/s1c_mme_test/CMakeLists.template b/cmake_targets/s1c_mme_test/CMakeLists.template
index 0503e6dc45a738cbd7e060b503c6247840e04c1e..29b32aa989c7955a15eda3b56f893d33d28f7ab8 100644
--- a/cmake_targets/s1c_mme_test/CMakeLists.template
+++ b/cmake_targets/s1c_mme_test/CMakeLists.template
@@ -49,7 +49,6 @@ set (  OPENAIR2 True )
 set (  OPENAIR_LTE True )
 set (  PACKAGE_NAME "oaisim" )
 set (  PDCP_USE_NETLINK True )
-set (  PC_DSP True )
 set (  PC_TARGET True )
 set (  PDCP_MSG_PRINT False )
 set (  PERFECT_CE False )
diff --git a/common/utils/telnetsrv/CMakeLists.txt b/common/utils/telnetsrv/CMakeLists.txt
index 6cf7f6f7e0468bb9152453fea41923e05ac3499d..8f74fd96ae2180ea7a12c0615b8f95161a42eece 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 -DNEW_FFT -DNO_RRM -DNone=1 -DOAI_NW_DRIVER_USE_NETLINK  -DOPENAIR1 -DOPENAIR2  -DOPENAIR_LTE -DPC_DSP -DPC_TARGET -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 -DNEW_FFT -DNO_RRM -DNone=1 -DOAI_NW_DRIVER_USE_NETLINK  -DOPENAIR1 -DOPENAIR2  -DOPENAIR_LTE -DPC_TARGET -DPHYSIM  -DPHY_CONTEXT -DPUCCH -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/openair2/UTIL/OCG/makefile b/openair2/UTIL/OCG/makefile
index 578c2006cb73e93588d849af174a4690bfcd7636..585e3ef9c27d79989754891e01e2a4798f8f419c 100644
--- a/openair2/UTIL/OCG/makefile
+++ b/openair2/UTIL/OCG/makefile
@@ -7,7 +7,7 @@ OPENAIR2_TOP = ../../../openair2
 OPENAIR3_TOP = ../../../openair3
 OPENAIR3     = $(OPENAIR3_DIR)
 
-CFLAGS += -DPHYSIM -DNODE_RG -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
+CFLAGS += -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
 
 
 CFLAGS += -m32 -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE 
diff --git a/openair2/UTIL/OMG/makefile b/openair2/UTIL/OMG/makefile
index 1aa3d2d451108c54c4f372b8c843eac807a0d05a..d3098195e3bab4204c499ee97fb28fc59a58918b 100644
--- a/openair2/UTIL/OMG/makefile
+++ b/openair2/UTIL/OMG/makefile
@@ -60,7 +60,7 @@ OPENAIR2_TOP = ../../../openair2
 OPENAIR3_TOP = ../../../openair3
 OPENAIR3     = $(OPENAIR3_DIR)
 
-CFLAGS += -DPHYSIM -DNODE_RG -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
+CFLAGS += -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
 
 
 CFLAGS += -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE 
diff --git a/openair2/UTIL/OMG/makefile_old b/openair2/UTIL/OMG/makefile_old
index aa622f8522072a148f207d80d60a9f4d1ca4b8b9..d779a186ab0265b07e74aafc0b1eaf54d3a4d098 100644
--- a/openair2/UTIL/OMG/makefile_old
+++ b/openair2/UTIL/OMG/makefile_old
@@ -62,7 +62,7 @@ OPENAIR2_TOP = ../../../openair2
 OPENAIR3_TOP = ../../../openair3
 OPENAIR3     = $(OPENAIR3_DIR)
 
-CFLAGS += -DPHYSIM -DNODE_RG -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
+CFLAGS += -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 #-Wno-packed-bitfield-compat
 
 
 CFLAGS += -DOPENAIR_LTE -DOPENAIR2 #-DOFDMA_ULSCH -DIFFT_FPGA -DIFFT_FPGA_UE 
diff --git a/targets/TEST/AT_COMMANDS/Makefile b/targets/TEST/AT_COMMANDS/Makefile
index 3f52e2af60be4fbdd89d9818179985ac1e0e49ed..0d3e6994ae28657ea934415b33f024d015518dd1 100755
--- a/targets/TEST/AT_COMMANDS/Makefile
+++ b/targets/TEST/AT_COMMANDS/Makefile
@@ -6,7 +6,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR)
 OPENAIR3_TOP = $(OPENAIR3_DIR)
 OPENAIR3     = $(OPENAIR3_DIR)
 
-CFLAGS += -m32 -DPHYSIM -DNODE_RG -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 
+CFLAGS += -m32 -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 
 
 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
 
diff --git a/targets/TEST/PACKET_TRACER/Makefile b/targets/TEST/PACKET_TRACER/Makefile
index 4d01cd6a691b15e56fd086908c6200fedaf030b5..0a656e1b360df2fbe6ea63d314f29a8546232014 100755
--- a/targets/TEST/PACKET_TRACER/Makefile
+++ b/targets/TEST/PACKET_TRACER/Makefile
@@ -6,7 +6,7 @@ OPENAIR2_TOP = $(OPENAIR2_DIR)
 OPENAIR3_TOP = $(OPENAIR3_DIR)
 OPENAIR3     = $(OPENAIR3_DIR)
 
-CFLAGS += -m32 -DPHYSIM -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -I/usr/include/X11
+CFLAGS += -m32 -DPHYSIM -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -I/usr/include/X11
 
 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
 
diff --git a/targets/TEST/PDCP/Makefile b/targets/TEST/PDCP/Makefile
index 7b9e20ce64d6823dce27968218ab30e5a08dcf42..fd8de0b51465e3558e91649f5ee77a149427f63f 100755
--- a/targets/TEST/PDCP/Makefile
+++ b/targets/TEST/PDCP/Makefile
@@ -8,7 +8,7 @@ OPENAIR3     = $(OPENAIR3_DIR)
 
 EXE_FILE_NAME = test_pdcp
 
-CFLAGS += -m32 -DPHYSIM -DNODE_RG -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 
+CFLAGS += -m32 -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11 
 
 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
 
diff --git a/targets/TEST/PDCP/with_rlc/Makefile.data_bearer b/targets/TEST/PDCP/with_rlc/Makefile.data_bearer
index 3f7d841d6a50489509c36fe71117b5f03b0e8960..fa7add3c148a6bcb7021b40beb41e1b4b63ad81a 100755
--- a/targets/TEST/PDCP/with_rlc/Makefile.data_bearer
+++ b/targets/TEST/PDCP/with_rlc/Makefile.data_bearer
@@ -8,7 +8,7 @@ OPENAIR3     = $(OPENAIR3_DIR)
 
 EXE_FILE_NAME = test_pdcp_rlc
 
-CFLAGS += -m32 -DPHYSIM -DNODE_RG -DPC_TARGET -DPC_DSP -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11
+CFLAGS += -m32 -DPHYSIM -DNODE_RG -DPC_TARGET -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DMAX_MODULES=1 -I/usr/include/X11
 
 ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES