diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
index 0f13fea3ca..82b3410bc1 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
@@ -38,8 +38,6 @@
 
 //#define DEBUG_LLR_SIC
 
-int16_t nr_zeros[8] __attribute__((aligned(16))) = {0, 0, 0, 0, 0, 0, 0, 0};
-
 //==============================================================================================
 // SINGLE-STREAM
 //==============================================================================================
diff --git a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
index fddb484727..ef83d8013b 100644
--- a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+++ b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
@@ -186,22 +186,3 @@ void pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, const UE_nr_rxtx_proc_t *proc, n
     pucch_vars->active[i] = false;
   }
 }
-
-int      dummy_csi_status = 0;
-uint32_t dummy_csi_payload = 0;
-
-
-/* FFS TODO_NR code that should be removed */
-
-void set_csi_nr(int csi_status, uint32_t csi_payload)
-{
-  dummy_csi_status = csi_status;
-
-  if (dummy_csi_status == 0) {
-    dummy_csi_payload = 0;
-  }
-  else {
-    dummy_csi_payload = csi_payload;
-  }
-}
-
diff --git a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.h b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.h
index e4063fbd78..6c3cc3abd6 100644
--- a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.h
+++ b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.h
@@ -52,6 +52,4 @@
 
 void pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, const UE_nr_rxtx_proc_t *proc, nr_phy_data_tx_t *phy_data, c16_t **txdataF);
 
-void set_csi_nr(int csi_status, uint32_t csi_payload);
-
 #endif /* PUCCH_UCI_UE_NR_H */
diff --git a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c
index c19680c6d0..0c9968ce55 100644
--- a/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c
+++ b/openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c
@@ -1074,8 +1074,6 @@ int test_csi_dedicated(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *proc)
 
   ue->dlsch[proc->thread_id][gNB_id][0]->current_harq_pid = NR_MAX_DLSCH_HARQ_PROCESSES;
 
-  set_csi_nr( 4, 0x0E );
-
   printf("\n  => Test : PUCCH format from dedicated config with CSI alone \n");
 
   if (pucch_procedures_ue_nr(ue, gNB_id, proc, reset_harq) != true) {
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
index 58adc41a65..17b1b02408 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
@@ -60,9 +60,6 @@ static int      nr_pdcp_current_time_last_subframe;
 hash_table_t  *pdcp_coll_p;
 static uint64_t pdcp_optmask;
 
-uint8_t first_dcch = 0;
-uint8_t proto_agent_flag = 0;
-
 static ngran_node_t node_type;
 
 nr_pdcp_entity_t *nr_pdcp_get_rb(nr_pdcp_ue_t *ue, int rb_id, bool srb_flag)
diff --git a/openair2/PHY_INTERFACE/phy_interface_vars.h b/openair2/PHY_INTERFACE/phy_interface_vars.h
index 5f205d3024..db33f52091 100644
--- a/openair2/PHY_INTERFACE/phy_interface_vars.h
+++ b/openair2/PHY_INTERFACE/phy_interface_vars.h
@@ -31,14 +31,5 @@
 #endif
 
 
-unsigned int mac_debug;
-
-//MAC_xface *mac_xface;
-
-//MACPHY_PARAMS MACPHY_params;
-
-unsigned int mac_registered;
-
-
 #endif
 
diff --git a/openair3/NAS/NR_UE/nr_nas_msg_sim.c b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
index f9d551ef3d..e0712c3691 100644
--- a/openair3/NAS/NR_UE/nr_nas_msg_sim.c
+++ b/openair3/NAS/NR_UE/nr_nas_msg_sim.c
@@ -53,8 +53,6 @@
 #include "openair3/SECU/nas_stream_eia2.h"
 #include "openair3/UTILS/conversions.h"
 
-uint8_t  *registration_request_buf;
-uint32_t  registration_request_len;
 extern char *baseNetAddress;
 extern uint16_t NB_UE_INST;
 static nr_ue_nas_t nr_ue_nas = {0};
@@ -474,10 +472,10 @@ void generateRegistrationRequest(as_nas_info_t *initialNasMsg, nr_ue_nas_t *nas)
 
   // encode the message
   initialNasMsg->data = malloc16_clear(size * sizeof(Byte_t));
-  registration_request_buf = initialNasMsg->data;
+  nas->registration_request_buf = initialNasMsg->data;
 
   initialNasMsg->length = mm_msg_encode(mm_msg, (uint8_t*)(initialNasMsg->data), size);
-  registration_request_len = initialNasMsg->length;
+  nas->registration_request_len = initialNasMsg->length;
 
 }
 
@@ -591,9 +589,9 @@ static void generateSecurityModeComplete(nr_ue_nas_t *nas, as_nas_info_t *initia
 
   size += fill_imeisv(&mm_msg->fgs_security_mode_complete.fgsmobileidentity, nas->uicc);
 
-  mm_msg->fgs_security_mode_complete.fgsnasmessagecontainer.nasmessagecontainercontents.value  = registration_request_buf;
-  mm_msg->fgs_security_mode_complete.fgsnasmessagecontainer.nasmessagecontainercontents.length = registration_request_len;
-  size += (registration_request_len + 2);
+  mm_msg->fgs_security_mode_complete.fgsnasmessagecontainer.nasmessagecontainercontents.value  = nas->registration_request_buf;
+  mm_msg->fgs_security_mode_complete.fgsnasmessagecontainer.nasmessagecontainercontents.length = nas->registration_request_len;
+  size += (nas->registration_request_len + 2);
 
   // encode the message
   initialNasMsg->data = (Byte_t *)malloc(size * sizeof(Byte_t));
diff --git a/openair3/NAS/NR_UE/nr_nas_msg_sim.h b/openair3/NAS/NR_UE/nr_nas_msg_sim.h
index 0d2d8f5cc9..9a260dfc8f 100644
--- a/openair3/NAS/NR_UE/nr_nas_msg_sim.h
+++ b/openair3/NAS/NR_UE/nr_nas_msg_sim.h
@@ -102,6 +102,8 @@ typedef struct {
   stream_security_container_t *security_container;
   Guti5GSMobileIdentity_t *guti;
   bool termination_procedure;
+  uint8_t  *registration_request_buf;
+  uint32_t  registration_request_len;
 } nr_ue_nas_t;
 
 typedef enum fgs_protocol_discriminator_e {