diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d756434c4..2544c86d7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,7 +339,6 @@ target_link_libraries(nr_rrc PUBLIC asn1_nr_rrc asn1_lte_rrc)
 set(S1AP_DIR ${OPENAIR3_DIR}/S1AP)
 include_directories ("${S1AP_DIR}")
 add_library(s1ap
-  ${S1AP_DIR}/s1ap_common.c
   ${S1AP_DIR}/s1ap_eNB.c
   ${S1AP_DIR}/s1ap_eNB_context_management_procedures.c
   ${S1AP_DIR}/s1ap_eNB_decoder.c
diff --git a/doc/Doxyfile b/doc/Doxyfile
index f128e3eb88..e67078a043 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -1021,7 +1021,6 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_ue_context.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_management_procedures.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_context_management_procedures.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_common.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_decoder.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_management_procedures.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair3/S1AP/s1ap_eNB_handlers.h \
diff --git a/executables/nr-cuup.c b/executables/nr-cuup.c
index 6467683cac..403f78ddb3 100644
--- a/executables/nr-cuup.c
+++ b/executables/nr-cuup.c
@@ -37,7 +37,6 @@ RAN_CONTEXT_t RC;
 THREAD_STRUCT thread_struct;
 uint64_t downlink_frequency[MAX_NUM_CCs][4];
 int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
-int asn1_xer_print;
 int oai_exit = 0;
 instance_t CUuniqInstance = 0;
 
diff --git a/openair2/E1AP/e1ap_common.h b/openair2/E1AP/e1ap_common.h
index 452762965c..6c556a6cc6 100644
--- a/openair2/E1AP/e1ap_common.h
+++ b/openair2/E1AP/e1ap_common.h
@@ -41,8 +41,6 @@ typedef struct e1ap_upcp_inst_s {
   e1ap_net_config_t net_config;
 } e1ap_upcp_inst_t;
 
-extern int asn1_xer_print;
-
 // forward declaration so we don't require E1AP ASN.1 when including this
 // header
 struct E1AP_E1AP_PDU;
diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h
index db04c5a8da..b751d78733 100644
--- a/openair2/GNB_APP/gnb_paramdef.h
+++ b/openair2/GNB_APP/gnb_paramdef.h
@@ -49,9 +49,6 @@
 #define GNB_CONF_STRING_OTG_APP_TYPE              "app_type"
 #define GNB_CONF_STRING_OTG_BG_TRAFFIC            "bg_traffic"
 
-extern int asn_debug;
-extern int asn1_xer_print;
-
 #ifdef LIBCONFIG_LONG
 #define libconfig_int long
 #else
diff --git a/openair2/M2AP/m2ap_common.c b/openair2/M2AP/m2ap_common.c
index aa090d124d..d9183df6fb 100644
--- a/openair2/M2AP/m2ap_common.c
+++ b/openair2/M2AP/m2ap_common.c
@@ -47,7 +47,7 @@ ssize_t m2ap_generate_initiating_message(
   pdu.choice.initiatingMessage.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.initiatingMessage.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M2AP_M2AP_PDU, (void *)&pdu);
   }
 
@@ -80,7 +80,7 @@ ssize_t m2ap_generate_unsuccessfull_outcome(
   pdu.choice.successfulOutcome.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.successfulOutcome.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M2AP_M2AP_PDU, (void *)&pdu);
   }
 
diff --git a/openair2/M2AP/m2ap_common.h b/openair2/M2AP/m2ap_common.h
index 266b303518..a875d8d078 100644
--- a/openair2/M2AP/m2ap_common.h
+++ b/openair2/M2AP/m2ap_common.h
@@ -50,8 +50,6 @@
 # define M2AP_PORT 36423
 #endif
 
-extern int asn1_xer_print;
-
 #include "common/utils/LOG/log.h"
 #include "m2ap_default_values.h"
 #define M2AP_INFO(x, args...) LOG_I(M2AP, x, ##args)
diff --git a/openair2/M2AP/m2ap_decoder.c b/openair2/M2AP/m2ap_decoder.c
index 1237c4ec8e..4abd43f564 100644
--- a/openair2/M2AP/m2ap_decoder.c
+++ b/openair2/M2AP/m2ap_decoder.c
@@ -165,7 +165,7 @@ int m2ap_decode_pdu(M2AP_M2AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t
                         length,
                         0,
                         0);
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M2AP_M2AP_PDU, pdu);
   }
 
diff --git a/openair2/M2AP/m2ap_encoder.c b/openair2/M2AP/m2ap_encoder.c
index 8f798ff55c..81a3bfce92 100644
--- a/openair2/M2AP/m2ap_encoder.c
+++ b/openair2/M2AP/m2ap_encoder.c
@@ -44,7 +44,7 @@ int m2ap_encode_pdu(M2AP_M2AP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
   DevAssert(buffer != NULL);
   DevAssert(len != NULL);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M2AP_M2AP_PDU, (void *)pdu);
   }
 
diff --git a/openair2/X2AP/x2ap_common.c b/openair2/X2AP/x2ap_common.c
index a687b90666..0fc63b7de5 100644
--- a/openair2/X2AP/x2ap_common.c
+++ b/openair2/X2AP/x2ap_common.c
@@ -47,7 +47,7 @@ ssize_t x2ap_generate_initiating_message(
   pdu.choice.initiatingMessage.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.initiatingMessage.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_X2AP_X2AP_PDU, (void *)&pdu);
   }
 
@@ -79,7 +79,7 @@ ssize_t x2ap_generate_successfull_outcome(
   pdu.choice.successfulOutcome.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.successfulOutcome.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_X2AP_X2AP_PDU, (void *)&pdu);
   }
 
@@ -111,7 +111,7 @@ ssize_t x2ap_generate_unsuccessfull_outcome(
   pdu.choice.successfulOutcome.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.successfulOutcome.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_X2AP_X2AP_PDU, (void *)&pdu);
   }
 
diff --git a/openair2/X2AP/x2ap_common.h b/openair2/X2AP/x2ap_common.h
index 81880cb71c..36dfe24287 100644
--- a/openair2/X2AP/x2ap_common.h
+++ b/openair2/X2AP/x2ap_common.h
@@ -49,8 +49,6 @@
 # define X2AP_PORT 36422
 #endif
 
-extern int asn1_xer_print;
-
 #include "common/utils/LOG/log.h"
 #define X2AP_INFO(x, args...) LOG_I(X2AP, x, ##args)
 #define X2AP_ERROR(x, args...) LOG_E(X2AP, x, ##args)
diff --git a/openair2/X2AP/x2ap_eNB_decoder.c b/openair2/X2AP/x2ap_eNB_decoder.c
index 6d7897bf14..81cb77dfef 100644
--- a/openair2/X2AP/x2ap_eNB_decoder.c
+++ b/openair2/X2AP/x2ap_eNB_decoder.c
@@ -156,7 +156,7 @@ int x2ap_eNB_decode_pdu(X2AP_X2AP_PDU_t *pdu, const uint8_t *const buffer, uint3
                         length,
                         0,
                         0);
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_X2AP_X2AP_PDU, pdu);
   }
 
diff --git a/openair2/X2AP/x2ap_eNB_encoder.c b/openair2/X2AP/x2ap_eNB_encoder.c
index 8b1c030d35..a82eb03f9a 100644
--- a/openair2/X2AP/x2ap_eNB_encoder.c
+++ b/openair2/X2AP/x2ap_eNB_encoder.c
@@ -44,7 +44,7 @@ int x2ap_eNB_encode_pdu(X2AP_X2AP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
   DevAssert(buffer != NULL);
   DevAssert(len != NULL);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_X2AP_X2AP_PDU, (void *)pdu);
   }
 
diff --git a/openair3/M3AP/m3ap_common.c b/openair3/M3AP/m3ap_common.c
index e43275d96c..669d7eaa5e 100644
--- a/openair3/M3AP/m3ap_common.c
+++ b/openair3/M3AP/m3ap_common.c
@@ -47,7 +47,7 @@ ssize_t m3ap_generate_initiating_message(
   pdu.choice.initiatingMessage.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.initiatingMessage.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M3AP_M3AP_PDU, (void *)&pdu);
   }
 
@@ -80,7 +80,7 @@ ssize_t m3ap_generate_unsuccessfull_outcome(
   pdu.choice.successfulOutcome.criticality   = criticality;
   ANY_fromType_aper((ANY_t *)&pdu.choice.successfulOutcome.value, td, sptr);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M3AP_M3AP_PDU, (void *)&pdu);
   }
 
diff --git a/openair3/M3AP/m3ap_common.h b/openair3/M3AP/m3ap_common.h
index 7c8ea18a5d..f5acb6bdf5 100644
--- a/openair3/M3AP/m3ap_common.h
+++ b/openair3/M3AP/m3ap_common.h
@@ -48,8 +48,6 @@
 # define M3AP_PORT 36444
 #endif
 
-extern int asn1_xer_print;
-
 #include "common/utils/LOG/log.h"
 #include "m3ap_default_values.h"
 #define M3AP_INFO(x, args...) LOG_I(M3AP, x, ##args)
diff --git a/openair3/M3AP/m3ap_decoder.c b/openair3/M3AP/m3ap_decoder.c
index cee0a5ff41..36c8f64fae 100644
--- a/openair3/M3AP/m3ap_decoder.c
+++ b/openair3/M3AP/m3ap_decoder.c
@@ -188,7 +188,7 @@ int m3ap_decode_pdu(M3AP_M3AP_PDU_t *pdu, const uint8_t *const buffer, uint32_t
                         length,
                         0,
                         0);
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M3AP_M3AP_PDU, pdu);
   }
 
diff --git a/openair3/M3AP/m3ap_encoder.c b/openair3/M3AP/m3ap_encoder.c
index 2e1cbf80af..86a710ca90 100644
--- a/openair3/M3AP/m3ap_encoder.c
+++ b/openair3/M3AP/m3ap_encoder.c
@@ -44,7 +44,7 @@ int m3ap_encode_pdu(M3AP_M3AP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
   DevAssert(buffer != NULL);
   DevAssert(len != NULL);
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_M3AP_M3AP_PDU, (void *)pdu);
   }
 
diff --git a/openair3/NGAP/ngap_common.c b/openair3/NGAP/ngap_common.c
index 7b960fed0b..82c2ccaf2a 100644
--- a/openair3/NGAP/ngap_common.c
+++ b/openair3/NGAP/ngap_common.c
@@ -31,8 +31,6 @@
 #include "conversions.h"
 #include "ngap_common.h"
 
-int asn1_xer_print = 0;
-
 void encode_ngap_cause(NGAP_Cause_t *out, const ngap_cause_t *in)
 {
   switch (in->type) {
diff --git a/openair3/NGAP/ngap_common.h b/openair3/NGAP/ngap_common.h
index 82a8fe9234..dd7fdebc54 100644
--- a/openair3/NGAP/ngap_common.h
+++ b/openair3/NGAP/ngap_common.h
@@ -48,9 +48,6 @@
 
 #define NGAP_UE_ID_FMT  "0x%06"PRIX32
 
-extern int asn_debug;
-extern int asn1_xer_print;
-
 # include "common/utils/LOG/log.h"
 # include "ngap_gNB_default_values.h"
 # define NGAP_ERROR(x, args...) LOG_E(NGAP, x, ##args)
diff --git a/openair3/NGAP/ngap_gNB_encoder.c b/openair3/NGAP/ngap_gNB_encoder.c
index ee3b37e07d..c3c095541d 100644
--- a/openair3/NGAP/ngap_gNB_encoder.c
+++ b/openair3/NGAP/ngap_gNB_encoder.c
@@ -115,7 +115,7 @@ int ngap_gNB_encode_pdu(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
   DevAssert(pdu != NULL);
   DevAssert(buffer != NULL);
   DevAssert(len != NULL);
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, (void *)pdu);
   }
   switch (pdu->present) {
diff --git a/openair3/NGAP/ngap_gNB_nas_procedures.c b/openair3/NGAP/ngap_gNB_nas_procedures.c
index 1aafeca8c9..b291f6b96c 100644
--- a/openair3/NGAP/ngap_gNB_nas_procedures.c
+++ b/openair3/NGAP/ngap_gNB_nas_procedures.c
@@ -690,7 +690,7 @@ int ngap_gNB_initial_ctxt_resp(instance_t instance, ngap_initial_context_setup_r
     // ie->value.choice.CriticalityDiagnostics =;
   }
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, &pdu);
   }
 
@@ -772,7 +772,7 @@ int ngap_gNB_initial_ctxt_fail(instance_t instance, ngap_initial_context_setup_f
     ie->value.present = NGAP_InitialContextSetupFailureIEs__value_PR_Cause;
     encode_ngap_cause(&ie->value.choice.Cause, &initial_ctxt_fail->cause);
   }
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, &pdu);
   }
   if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
diff --git a/openair3/S1AP/s1ap_common.c b/openair3/S1AP/s1ap_common.c
deleted file mode 100644
index d31c6e5839..0000000000
--- a/openair3/S1AP/s1ap_common.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file s1ap_common.c
- * \brief s1ap procedures for both eNB and MME
- * \author Sebastien ROUX and Navid Nikaein
- * \email navid.nikaein@eurecom.fr
- * \date 2012-2015
- * \version 0.1
- */
-
-#include <stdint.h>
-
-#include "s1ap_common.h"
-#include "S1AP_S1AP-PDU.h"
-
-
-int asn1_xer_print = 0;
-
-
-void s1ap_handle_criticality(S1AP_Criticality_t criticality)
-{
-}
diff --git a/openair3/S1AP/s1ap_common.h b/openair3/S1AP/s1ap_common.h
index 797bc7be8a..7ef7e589ca 100644
--- a/openair3/S1AP/s1ap_common.h
+++ b/openair3/S1AP/s1ap_common.h
@@ -52,8 +52,6 @@
 
 #define S1AP_UE_ID_FMT  "0x%06"PRIX32
 
-extern int asn1_xer_print;
-
 #include "common/utils/LOG/log.h"
 #include "s1ap_eNB_default_values.h"
 #define S1AP_ERROR(x, args...) LOG_E(S1AP, x, ##args)
@@ -89,10 +87,4 @@ extern int asn1_xer_print;
  **/
 typedef int (*s1ap_message_decoded_callback)(sctp_assoc_t assoc_id, uint32_t stream, S1AP_S1AP_PDU_t *pdu);
 
-/** \brief Handle criticality
- \param criticality Criticality of the IE
- @returns void
- **/
-void s1ap_handle_criticality(S1AP_Criticality_t criticality);
-/** @}*/
 #endif /* S1AP_COMMON_H_ */
diff --git a/openair3/S1AP/s1ap_eNB_encoder.c b/openair3/S1AP/s1ap_eNB_encoder.c
index 8317f02731..6ff837a7f1 100644
--- a/openair3/S1AP/s1ap_eNB_encoder.c
+++ b/openair3/S1AP/s1ap_eNB_encoder.c
@@ -129,7 +129,7 @@ int s1ap_eNB_encode_initiating(S1AP_S1AP_PDU_t *pdu,
       return -1;
   }
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_S1AP_S1AP_PDU, (void *)pdu);
   }
 
@@ -183,7 +183,7 @@ int s1ap_eNB_encode_successfull_outcome(S1AP_S1AP_PDU_t *pdu,
       return -1;
   }
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_S1AP_S1AP_PDU, (void *)pdu);
   }
 
@@ -214,7 +214,7 @@ int s1ap_eNB_encode_unsuccessfull_outcome(S1AP_S1AP_PDU_t *pdu,
       return -1;
   }
 
-  if (asn1_xer_print) {
+  if (LOG_DEBUGFLAG(DEBUG_ASN1)) {
     xer_fprint(stdout, &asn_DEF_S1AP_S1AP_PDU, (void *)pdu);
   }
 
diff --git a/openair3/TEST/test_s1ap.c b/openair3/TEST/test_s1ap.c
index 8e61c338ac..1ecb30d476 100644
--- a/openair3/TEST/test_s1ap.c
+++ b/openair3/TEST/test_s1ap.c
@@ -154,10 +154,6 @@ void doit (void)
 {
   int i;
   break_on_error = 1;
-
-  //     asn1_xer_print = 1;
-  //     asn_debug = 1;
-
   for (i = 0; i < sizeof(s1ap_test) / sizeof(s1ap_test_t); i++) {
     S1AP_S1AP_PDU_t pdu;
     uint8_t *buffer;