diff --git a/openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c b/openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
index 3fb09e2ed7..6e2e515ac8 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
@@ -152,12 +152,7 @@ int lte_dl_channel_estimation(PHY_VARS_UE *ue,
   }
 
   // generate pilot
-  lte_dl_cell_spec_rx(ue,
-                      eNB_offset,
-                      &pilot[p][0],
-                      Ns,
-                      (l==0)?0:1,
-                      p);
+  lte_dl_cell_spec_rx(ue, eNB_offset, &pilot[p][0], Ns, (l == 0) ? 0 : 1);
 
   for (aarx=0; aarx<ue->frame_parms.nb_antennas_rx; aarx++) {
     c16_t *pil = (c16_t *)&pilot[p][0];
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_estimation.h b/openair1/PHY/LTE_ESTIMATION/lte_estimation.h
index 7d3d23d087..df9bcedb80 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_estimation.h
+++ b/openair1/PHY/LTE_ESTIMATION/lte_estimation.h
@@ -180,7 +180,6 @@ int32_t lte_ul_channel_estimation(LTE_DL_FRAME_PARMS *frame_parms,
                                   c16_t **ul_ch_estimates,
                                   c16_t **ul_ch_estimates_time,
                                   c16_t **rxdataF_ext,
-                                  module_id_t UE_id,
                                   uint8_t l,
                                   uint8_t Ns);
 
diff --git a/openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c b/openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
index 985a2a7f8a..55c08c8024 100644
--- a/openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+++ b/openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
@@ -56,7 +56,6 @@ int32_t lte_ul_channel_estimation(LTE_DL_FRAME_PARMS *frame_parms,
                                   c16_t **ul_ch_estimates,
                                   c16_t **ul_ch_estimates_time,
                                   c16_t **rxdataF_ext,
-                                  module_id_t UE_id,
                                   unsigned char l,
                                   unsigned char Ns)
 {
diff --git a/openair1/PHY/LTE_REFSIG/lte_dl_cell_spec.c b/openair1/PHY/LTE_REFSIG/lte_dl_cell_spec.c
index 2bf7385cb3..6903a9987b 100644
--- a/openair1/PHY/LTE_REFSIG/lte_dl_cell_spec.c
+++ b/openair1/PHY/LTE_REFSIG/lte_dl_cell_spec.c
@@ -174,15 +174,8 @@ int lte_dl_cell_spec(PHY_VARS_eNB *eNB,
   return(0);
 }
 
-int lte_dl_cell_spec_rx(PHY_VARS_UE *ue,
-                        uint8_t eNB_offset,
-                        int *output,
-                        unsigned char Ns,
-                        unsigned char l,
-                        unsigned char p)
+int lte_dl_cell_spec_rx(PHY_VARS_UE *ue, uint8_t eNB_offset, int *output, unsigned char Ns, unsigned char l)
 {
-
-
   unsigned char mprime,mprime_dword,mprime_qpsk_symb,m;
   unsigned short k=0;
   unsigned int qpsk[4];
diff --git a/openair1/PHY/LTE_REFSIG/lte_refsig.h b/openair1/PHY/LTE_REFSIG/lte_refsig.h
index 0521c9d3a5..77f91d0558 100644
--- a/openair1/PHY/LTE_REFSIG/lte_refsig.h
+++ b/openair1/PHY/LTE_REFSIG/lte_refsig.h
@@ -108,14 +108,8 @@ int lte_dl_mbsfn_khz_1dot25(PHY_VARS_eNB *phy_vars_eNB, int32_t *output,
 @param output Output vector for OFDM symbol (Frequency Domain)
 @param Ns Slot number (0..19)
 @param l symbol (0,1) - Note 1 means 3!
-@param p antenna intex
 */
-int lte_dl_cell_spec_rx(PHY_VARS_UE *phy_vars_ue,
-                        uint8_t eNB_offset,
-                        int *output,
-                        unsigned char Ns,
-                        unsigned char l,
-                        unsigned char p);
+int lte_dl_cell_spec_rx(PHY_VARS_UE *ue, uint8_t eNB_offset, int *output, unsigned char Ns, unsigned char l);
 
 /*!\brief This function generates the ue-specific reference signal
  * sequence (36-211, Sec 6.10.3.1) for beamforming channel estimation upon reception
diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c b/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c
index 21e752c09b..b16c0a8022 100644
--- a/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools_common.c
@@ -834,13 +834,6 @@ void generate_RIV_tables(void)
 //       n_tilde_PRB(2,3) = (3,5)
 //       n_tilde_PRB(0,1) = (0,2)
 
-uint32_t get_rballoc(vrb_t vrb_type,uint16_t rb_alloc_dci)
-{
-
-  return(localRIV2alloc_LUT25[rb_alloc_dci]);
-
-}
-
 uint8_t subframe2harq_pid(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame,uint8_t subframe)
 {
   uint8_t ret = 255;
diff --git a/openair1/PHY/LTE_TRANSPORT/transport_common_proto.h b/openair1/PHY/LTE_TRANSPORT/transport_common_proto.h
index 8bc71e5536..f8d64d0582 100644
--- a/openair1/PHY/LTE_TRANSPORT/transport_common_proto.h
+++ b/openair1/PHY/LTE_TRANSPORT/transport_common_proto.h
@@ -53,13 +53,6 @@ uint32_t get_TBS_UL(uint8_t mcs, uint16_t nb_rb);
 */
 uint32_t get_prb(int N_RB_DL,int odd_slot,int vrb,int Ngap);
 
-/* \brief Return prb for a given vrb index
-   @param vrb_type VRB type (0=localized,1=distributed)
-   @param rb_alloc_dci rballoc field from DCI
-*/
-uint32_t get_rballoc(vrb_t vrb_type,uint16_t rb_alloc_dci);
-
-
 /* \brief Return bit-map of resource allocation for a given DCI rballoc (RIV format) and vrb type
    @returns Transmission mode (1-7)
 */
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c b/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
index ff456eed44..bc57ac5f81 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
@@ -384,7 +384,6 @@ void ulsch_channel_compensation(int32_t **rxdataF_ext,
                                 int32_t **rxdataF_comp,
                                 LTE_DL_FRAME_PARMS *frame_parms,
                                 uint8_t symbol,
-                                uint8_t Qm,
                                 uint16_t nb_rb,
                                 uint8_t output_shift) {
 
@@ -518,7 +517,6 @@ void rx_ulsch(PHY_VARS_eNB *eNB,
                               (c16_t **)eNB->pusch_vars[UE_id]->drs_ch_estimates,
                               (c16_t **)eNB->pusch_vars[UE_id]->drs_ch_estimates_time,
                               (c16_t **)eNB->pusch_vars[UE_id]->rxdataF_ext,
-                              UE_id,
                               l % (frame_parms->symbols_per_tti / 2),
                               l / (frame_parms->symbols_per_tti / 2));
   }
@@ -599,7 +597,6 @@ void rx_ulsch(PHY_VARS_eNB *eNB,
       pusch_vars->rxdataF_comp,
       frame_parms,
       l,
-      Qm,
       ulsch[UE_id]->harq_processes[harq_pid]->nb_rb,
       log2_maxh); // log2_maxh+I0_shift
 
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c b/openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c
index ce0ef00d11..f6ca3157d5 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c
+++ b/openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c
@@ -135,13 +135,6 @@ int32_t generate_srs(LTE_DL_FRAME_PARMS *frame_parms,
   return(0);
 }
 
-int generate_srs_tx_emul(PHY_VARS_UE *phy_vars_ue,uint8_t subframe)
-{
-
-  LOG_D(PHY,"[UE] generate_srs_tx_emul for subframe %d\n",subframe);
-  return(0);
-}
-
 #ifdef MAIN
 main()
 {
diff --git a/openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h b/openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
index af1546a43e..2fe85fdf39 100644
--- a/openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
+++ b/openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
@@ -944,13 +944,6 @@ uint32_t get_TBS_DL(uint8_t mcs, uint16_t nb_rb);
     @return Transport block size */
 uint32_t get_TBS_UL(uint8_t mcs, uint16_t nb_rb);
 
-/* \brief Return prb for a given vrb index
-   @param vrb_type VRB type (0=localized,1=distributed)
-   @param rb_alloc_dci rballoc field from DCI
-*/
-uint32_t get_rballoc(vrb_t vrb_type,uint16_t rb_alloc_dci);
-
-
 /* \brief Return bit-map of resource allocation for a given DCI rballoc (RIV format) and vrb type
    @returns Transmission mode (1-7)
 */
diff --git a/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c b/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c
index 5d35e385e3..eba54c8e5f 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c
@@ -253,7 +253,6 @@ uint32_t calc_power_csirs(const uint16_t *x, const fapi_nr_dl_config_csirs_pdu_r
 
 static int nr_csi_rs_channel_estimation(
     const NR_DL_FRAME_PARMS *fp,
-    const UE_nr_rxtx_proc_t *proc,
     const fapi_nr_dl_config_csirs_pdu_rel15_t *csirs_config_pdu,
     const nr_csi_info_t *nr_csi_info,
     const c16_t **csi_rs_generated_signal,
@@ -898,7 +897,6 @@ void nr_ue_csi_rs_procedures(PHY_VARS_NR_UE *ue,
   // if we need to measure only RSRP no need to do channel estimation
   if (csirs_config_pdu->measurement_bitmap > 1)
     nr_csi_rs_channel_estimation(frame_parms,
-                                 proc,
                                  csirs_config_pdu,
                                  csi_info,
                                  (const c16_t **)csi_info->csi_rs_generated_signal,
diff --git a/openair1/SIMULATION/NR_PHY/nr_unitary_defs.h b/openair1/SIMULATION/NR_PHY/nr_unitary_defs.h
index f70082fc86..09aec413e8 100644
--- a/openair1/SIMULATION/NR_PHY/nr_unitary_defs.h
+++ b/openair1/SIMULATION/NR_PHY/nr_unitary_defs.h
@@ -21,6 +21,7 @@ int oai_exit = 0;
 
 void exit_function(const char *file, const char *function, const int line, const char *s, const int assert)
 {
+  UNUSED(assert);
   const char *msg = s == NULL ? "no comment" : s;
   printf("Exiting at: %s:%d %s(), %s\n", file, line, function, msg);
   exit(-1);
@@ -41,16 +42,6 @@ signed char quantize(double D, double x, unsigned char B)
   return ((char)qxd);
 }
 
-int oai_nfapi_rach_ind(nfapi_rach_indication_t *rach_ind)
-{
-  return (0);
-}
-// NR_IF_Module_t *NR_IF_Module_init(int Mod_id){return(NULL);}
-int oai_nfapi_ul_config_req(nfapi_ul_config_request_t *ul_config_req)
-{
-  return (0);
-}
-
 void stop_nr_nfapi_vnf()
 {
   abort();
diff --git a/openair2/UTIL/OPT/probe.c b/openair2/UTIL/OPT/probe.c
index eb522d4bd4..4190c8e106 100644
--- a/openair2/UTIL/OPT/probe.c
+++ b/openair2/UTIL/OPT/probe.c
@@ -189,7 +189,9 @@ static int PCAP_WritePDU(const uint8_t *PDU,
   return length;
 }
 
-static void *opt_listener_thread(void *arg) {
+static void *opt_listener_thread(void *arg)
+{
+  UNUSED(arg);
   ssize_t ret;
   struct sockaddr_in from_address;
   socklen_t socklen = sizeof(from_address);