diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 0aa9a2a48d1f0449f4534dbb5c926668783401fc..990365be5598246c4500f4972cb156bdb2b8fa2f 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -370,7 +370,6 @@ include_directories ("${OPENAIR_TARGETS}/ARCH/COMMON")
 ##############################################################
 #    ???!!! TO BE DOCUMENTED OPTIONS !!!???
 ##############################################################
-add_boolean_option(ASSERT True "???")
 add_boolean_option(ENABLE_SECURITY         True  "Enable LTE integrity and ciphering between RRC UE and eNB")
 add_boolean_option(ENABLE_USE_MME          True  "eNB connected to MME (INTERFACE S1-C), not standalone eNB")
 add_boolean_option(NO_RRM                  True  "DO WE HAVE A RADIO RESSOURCE MANAGER: NO")
diff --git a/cmake_targets/autotests/test.0101/CMakeLists.txt b/cmake_targets/autotests/test.0101/CMakeLists.txt
index 50c56b2d70092fd1ee8b3e94ee929b3bffddb146..84dff0bc38ea5d8b67b0f08d9e306a1597485c56 100644
--- a/cmake_targets/autotests/test.0101/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0101/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
 set ( ADDR_CONF False )
-set ( ASSERT True )
 set ( DEBUG_OMG False )
 set ( DISABLE_USE_NAS False )
 set ( DISABLE_XER_PRINT False )
diff --git a/cmake_targets/autotests/test.0102/CMakeLists.txt b/cmake_targets/autotests/test.0102/CMakeLists.txt
index 32e3f4a0b1a2208bc39371a8cfe6ea799e96ca6b..bd1ffacc034b943d31f043c4e3f5abfd579edeaa 100644
--- a/cmake_targets/autotests/test.0102/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0102/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
 set ( ADDR_CONF False )
-set ( ASSERT True )
 set ( DEBUG_OMG False )
 set ( DISABLE_USE_NAS False )
 set ( DISABLE_XER_PRINT False )
diff --git a/cmake_targets/autotests/test.0103/CMakeLists.txt b/cmake_targets/autotests/test.0103/CMakeLists.txt
index 2710d5f43a2b5f2ca0b52dcee20ca37bc390d4f3..426705a8696a0fb61b4b5d5fcb8cd915f75fd077 100644
--- a/cmake_targets/autotests/test.0103/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0103/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
 set ( ADDR_CONF False )
-set ( ASSERT True )
 set ( DEBUG_OMG False )
 set ( DISABLE_USE_NAS False )
 set ( DISABLE_XER_PRINT False )
diff --git a/cmake_targets/autotests/test.0106/CMakeLists.txt b/cmake_targets/autotests/test.0106/CMakeLists.txt
index c4ef942fc4004780a3afda8bdd0f95fe77202f76..577b533b8568a50f11a8eebcf59777c5a620b8e3 100644
--- a/cmake_targets/autotests/test.0106/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0106/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(ADDR_CONF False)
-set(ASSERT True)
 set(DEBUG_OMG False)
 set(DISABLE_XER_PRINT False)
 set(DRIVER2013 False)
diff --git a/cmake_targets/autotests/test.0107/CMakeLists.txt b/cmake_targets/autotests/test.0107/CMakeLists.txt
index 180bd867f4b9009b8907bfeb08d2eff91f436587..43c45ed09676d0368705ef5e9ac0296ec0621ac3 100644
--- a/cmake_targets/autotests/test.0107/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0107/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
 set ( ADDR_CONF False )
-set ( ASSERT True )
 set ( DEBUG_OMG False )
 set ( DISABLE_USE_NAS False )
 set ( DISABLE_XER_PRINT False )
diff --git a/cmake_targets/autotests/test.0108/CMakeLists.txt b/cmake_targets/autotests/test.0108/CMakeLists.txt
index 0b16fc722a6556cefa9248f17bd04f121c15f7fa..e3209539e1a04b51c1852fc6516c27b8a0294dcc 100644
--- a/cmake_targets/autotests/test.0108/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0108/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(ADDR_CONF False)
-set(ASSERT True)
 set(DEBUG_OMG False)
 set(DISABLE_XER_PRINT False)
 set(DRIVER2013 False)
diff --git a/cmake_targets/autotests/test.0114/CMakeLists.txt b/cmake_targets/autotests/test.0114/CMakeLists.txt
index 426c824bffc0aeb5d5566ec79e46521dfd8f1a49..5eadb5693fcb17dcb940e433713038eeba89da70 100644
--- a/cmake_targets/autotests/test.0114/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0114/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
 set(ADDR_CONF False)
-set(ASSERT True)
 set(DEBUG_OMG False)
 set(DISABLE_XER_PRINT False)
 set(DRIVER2013 False)
diff --git a/cmake_targets/autotests/test.0115/CMakeLists.txt b/cmake_targets/autotests/test.0115/CMakeLists.txt
index b6124779a5d591c594c3f01f0dec9556b4ef35c6..8cb05b423ac64ebf6d11befc7c302939be01d85d 100644
--- a/cmake_targets/autotests/test.0115/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0115/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
 set ( ADDR_CONF False )
-set ( ASSERT True )
 set ( DEBUG_OMG False )
 set ( DISABLE_USE_NAS False )
 set ( DISABLE_XER_PRINT False )
diff --git a/cmake_targets/autotests/test.0120/CMakeLists.txt b/cmake_targets/autotests/test.0120/CMakeLists.txt
index 32e3f4a0b1a2208bc39371a8cfe6ea799e96ca6b..bd1ffacc034b943d31f043c4e3f5abfd579edeaa 100644
--- a/cmake_targets/autotests/test.0120/CMakeLists.txt
+++ b/cmake_targets/autotests/test.0120/CMakeLists.txt
@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 
 set ( ADDR_CONF False )
-set ( ASSERT True )
 set ( DEBUG_OMG False )
 set ( DISABLE_USE_NAS False )
 set ( DISABLE_XER_PRINT False )
diff --git a/cmake_targets/epc_build_oai/CMakeLists.template b/cmake_targets/epc_build_oai/CMakeLists.template
index f501957084cd7dcf99317741b35fa35e52cb3290..21b0797454059ce8e962a0f1841d3798488958fe 100644
--- a/cmake_targets/epc_build_oai/CMakeLists.template
+++ b/cmake_targets/epc_build_oai/CMakeLists.template
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.8)
 
 set (  CMAKE_BUILD_TYPE "RelWithDebInfo" )
 set (  ADDR_CONF False )
-set (  ASSERT False )
 set (  BYTE_ORDER=LITTLE_ENDIAN )
 set (  DEBUG_OMG False )
 set (  DISABLE_ITTI_DETECT_SUB_TASK_ID True )
diff --git a/cmake_targets/hss_build/CMakeLists.txt b/cmake_targets/hss_build/CMakeLists.txt
index bae1cad0478c0a0b8c03f9c20124b6e158a76c47..d58393e868e292db8d380e2809537312c701198e 100755
--- a/cmake_targets/hss_build/CMakeLists.txt
+++ b/cmake_targets/hss_build/CMakeLists.txt
@@ -65,7 +65,6 @@ macro(add_option name val helpstr)
 endmacro(add_option)
 
 
-
 # compilation flags
 # added CMAKER conditional compilation to not bother legacy building system
 #############################################
@@ -75,9 +74,9 @@ endif()
 set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Debug Release RelWithDebInfo MinSizeRel)
 
 #
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat -DCMAKER")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -DMALLOC_CHECK_=3")
-set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ggdb -DMALLOC_CHECK_=3 -O2")
+set(CMAKE_C_FLAGS                  "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing -rdynamic -funroll-loops -Wno-packed-bitfield-compat -DCMAKER")
+set(CMAKE_C_FLAGS_DEBUG            "${CMAKE_C_FLAGS_DEBUG} -ggdb -DMALLOC_CHECK_=3")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO   "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ggdb -DMALLOC_CHECK_=3 -O2")
 
 
 INCLUDE(FindMySQL)
diff --git a/cmake_targets/oaisim_build_oai/CMakeLists.template b/cmake_targets/oaisim_build_oai/CMakeLists.template
index e122dd6c520be314edcf4a85ac962769c05b2b79..7b5de3093f233c8f9505361fecfe25740b38637b 100644
--- a/cmake_targets/oaisim_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_build_oai/CMakeLists.template
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.8)
 
 set (  CMAKE_BUILD_TYPE "RelWithDebInfo" )
 set (  ADDR_CONF False )
-set (  ASSERT True )
 set (  DEBUG_OMG False )
 set (  DISABLE_XER_PRINT False )
 set (  DRIVER2013 True )
diff --git a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
index 5191f281d92ccb226135d9a0cc38a3283b820fac..edd037ba02b5bcbcbaa19647be9f8d34e2e7513f 100644
--- a/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_mme_build_oai/CMakeLists.template
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.8)
 
 set (  CMAKE_BUILD_TYPE "RelWithDebInfo" )
 set (  ADDR_CONF False )
-set (  ASSERT False )
 set (  DEBUG_OMG False )
 set (  DISABLE_XER_PRINT False )
 set (  DRIVER2013 False )
diff --git a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
index 5f6252b34f4f6de5a35547189964041dc117af6b..7804abc6e74719d2b0047db71dea2c2986ece648 100644
--- a/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
+++ b/cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.8)
 
 set (  CMAKE_BUILD_TYPE "RelWithDebInfo" )
 set (  ADDR_CONF False )
-set (  ASSERT True )
 set (  DEBUG_OMG False )
 set (  DISABLE_XER_PRINT False )
 set (  DRIVER2013 True )