diff --git a/common/platform_types.h b/common/platform_types.h
index 9827dba974..9404f987ac 100644
--- a/common/platform_types.h
+++ b/common/platform_types.h
@@ -45,7 +45,6 @@ typedef uint16_t module_id_t;
 typedef uint8_t slice_id_t;
 typedef uint8_t eNB_index_t;
 typedef uint64_t ue_id_t;
-typedef int16_t smodule_id_t;
 typedef long rb_id_t;
 typedef long srb_id_t;
 
@@ -74,24 +73,7 @@ typedef enum {
   FDD = 0
 } frame_type_t;
 
-typedef enum link_direction_e { UNKNOWN_DIR = 0, DIR_UPLINK = 1, DIR_DOWNLINK = 2 } link_direction_t;
-
-typedef enum rb_type_e { UNKNOWN_RADIO_BEARER = 0, SIGNALLING_RADIO_BEARER = 1, RADIO_ACCESS_BEARER = 2 } rb_type_t;
-
-typedef enum { CR_ROUND = 0, CR_SRB12 = 1, CR_HOL = 2, CR_LC = 3, CR_CQI = 4, CR_LCP = 5, CR_NUM = 6 } sorting_criterion_t;
-
-typedef enum { POL_FAIR = 0, POL_GREEDY = 1, POL_NUM = 2 } accounting_policy_t;
-//-----------------------------------------------------------------------------
-// PHY TYPES
-//-----------------------------------------------------------------------------
-typedef uint8_t crc8_t;
-typedef uint16_t crc16_t;
-typedef uint32_t crc32_t;
 typedef unsigned int crc_t;
-
-//-----------------------------------------------------------------------------
-// MAC TYPES
-//-----------------------------------------------------------------------------
 typedef sdu_size_t tbs_size_t;
 typedef sdu_size_t tb_size_t;
 typedef unsigned int logical_chan_id_t;
@@ -103,9 +85,6 @@ typedef uint8_t mac_enb_index_t;
 //-----------------------------------------------------------------------------
 typedef unsigned int mui_t;
 typedef unsigned int confirm_t;
-typedef unsigned int rlc_tx_status_t;
-typedef int16_t rlc_sn_t;
-typedef uint16_t rlc_usn_t;
 typedef int32_t rlc_buffer_occupancy_t;
 typedef signed int rlc_op_status_t;
 
@@ -130,7 +109,6 @@ typedef struct {
 //-----------------------------------------------------------------------------
 typedef uint16_t pdcp_sn_t;
 typedef uint32_t pdcp_hfn_t;
-typedef int16_t pdcp_hfn_offset_t;
 
 typedef enum pdcp_transmission_mode_e {
   PDCP_TRANSMISSION_MODE_UNKNOWN = 0,
@@ -177,7 +155,6 @@ typedef struct net_ip_address_s {
 typedef uint32_t mbms_session_id_t;
 typedef uint16_t mbms_service_id_t;
 typedef uint16_t rnti_t;
-typedef uint8_t rrc_enb_index_t;
 typedef uint8_t mme_code_t;
 typedef uint32_t m_tmsi_t;
 
@@ -188,7 +165,6 @@ typedef uint32_t m_tmsi_t;
 #define P_RNTI (rnti_t)0xFFFE
 #define SI_RNTI (rnti_t)0xFFFF
 #define CBA_RNTI (rnti_t)0xfff4
-#define OAI_C_RNTI (rnti_t)0x1234
 typedef enum config_action_e {
   CONFIG_ACTION_NULL = 0,
   CONFIG_ACTION_ADD = 1,
@@ -256,8 +232,6 @@ typedef struct protocol_ctxt_s {
   eNB_index_t eNB_index; /*!< \brief  valid for UE indicating the index of connected eNB(s)      */
   bool brOption;
 } protocol_ctxt_t;
-// warning time hardcoded
-#define PROTOCOL_CTXT_TIME_MILLI_SECONDS(CtXt_h) ((CtXt_h)->frame * 10 + (CtXt_h)->subframe)
 
 #define UE_MODULE_ID_TO_INSTANCE(mODULE_iD) mODULE_iD + RC.nb_inst
 #define ENB_MODULE_ID_TO_INSTANCE(mODULE_iD) mODULE_iD
@@ -309,12 +283,6 @@ typedef struct protocol_ctxt_s {
 #define PROTOCOL_CTXT_ARGS(CTXT_Pp) \
   (CTXT_Pp)->frame, ((CTXT_Pp)->enb_flag == ENB_FLAG_YES) ? "eNB" : " UE", (CTXT_Pp)->module_id, (CTXT_Pp)->rntiMaybeUEid
 
-#define PROTOCOL_NR_CTXT_ARGS(CTXT_Pp) \
-  (CTXT_Pp)->frame, ((CTXT_Pp)->enb_flag == GNB_FLAG_YES) ? "gNB" : " UE", (CTXT_Pp)->module_id, (CTXT_Pp)->rntiMaybeUEid
-
-#define CHECK_CTXT_ARGS(CTXT_Pp)
-
-
 static inline int ceil_mod(const unsigned int v, const unsigned int mod)
 {
   return ((v + mod - 1) / mod) * mod;
diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
index f93044f9cd..0b8e9e2d40 100644
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp.c
@@ -231,8 +231,7 @@ bool pdcp_data_req(protocol_ctxt_t  *ctxt_pP,
   hashtable_rc_t     h_rc;
   uint8_t            rb_offset= (srb_flagP == 0) ? DTCH -1 : 0;
   uint16_t           pdcp_uid=0;
-  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_DATA_REQ,VCD_FUNCTION_IN);
-  CHECK_CTXT_ARGS(ctxt_pP);
+  VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_DATA_REQ, VCD_FUNCTION_IN);
 #if T_TRACER
 
   if (ctxt_pP->enb_flag != ENB_FLAG_NO)
diff --git a/openair2/LAYER2/RLC/rlc.h b/openair2/LAYER2/RLC/rlc.h
index 9afad74714..4559eb3273 100644
--- a/openair2/LAYER2/RLC/rlc.h
+++ b/openair2/LAYER2/RLC/rlc.h
@@ -262,22 +262,6 @@ void rlc_data_ind(const protocol_ctxt_t *const,
                   const sdu_size_t,
                   uint8_t *const);
 
-/*! \fn void rlc_data_conf     (const protocol_ctxt_t* const ctxtP, const srb_flag_t srb_flagP, const  rb_id_t rb_idP, const mui_t muiP, const rlc_tx_status_t statusP)
-* \brief    Interface with higher layers, confirm to upper layer the transmission status for a SDU stamped with a MUI, scheduled for transmission.
-* \param[in]  ctxtP            Running context.
-* \param[in]  srb_flagP        Flag to indicate SRB (1) or DRB (0)
-* \param[in]  rb_idP           Radio bearer identifier.
-* \param[in]  muiP             Message Unit identifier.
-* \param[in]  statusP          Status of the transmission (RLC_SDU_CONFIRM_YES, RLC_SDU_CONFIRM_NO).
-*/
-void rlc_data_conf(
-  const protocol_ctxt_t *const,
-  const  srb_flag_t,
-  const  rb_id_t,
-  const mui_t,
-  const rlc_tx_status_t );
-
-
 /*! \fn rlc_op_status_t rlc_stat_req     (
                         const protocol_ctxt_t* const ctxtP,
                         const  srb_flag_t    srb_flagP,