diff --git a/openair2/ENB_APP/flexran_agent_common.c b/openair2/ENB_APP/flexran_agent_common.c
index 74edb2173409f4a81c87a02b05bd6c39922153c9..f2d00145a05c9f752db5544fc14f35acb0ef9d86 100644
--- a/openair2/ENB_APP/flexran_agent_common.c
+++ b/openair2/ENB_APP/flexran_agent_common.c
@@ -576,7 +576,6 @@ int flexran_get_hol_delay(mid_t mod_id, mid_t ue_id, logical_chan_id_t channel_i
 short flexran_get_TA(mid_t mod_id, mid_t ue_id, int CC_id) {
   
   UE_list_t *UE_list=&eNB_mac_inst[mod_id].UE_list;
-  UE_sched_ctrl *ue_sched_ctl = &UE_list->UE_sched_ctrl[ue_id];
   int rnti;
 
   rnti = flexran_get_ue_crnti(mod_id, ue_id);
@@ -610,9 +609,6 @@ void flexran_update_TA(mid_t mod_id, mid_t ue_id, int CC_id) {
   UE_list_t *UE_list=&eNB_mac_inst[mod_id].UE_list;
   UE_sched_ctrl *ue_sched_ctl = &UE_list->UE_sched_ctrl[ue_id];
 
-  int rnti;
-  
-  rnti = flexran_get_ue_crnti(mod_id, ue_id);
   if (ue_sched_ctl->ta_timer == 0) {
     
     // WE SHOULD PROTECT the eNB_UE_stats with a mutex here ...                                                                         
@@ -631,7 +627,6 @@ void flexran_update_TA(mid_t mod_id, mid_t ue_id, int CC_id) {
 int flexran_get_MAC_CE_bitmap_TA(mid_t mod_id, mid_t ue_id,int CC_id) {
   
   UE_list_t			*UE_list      = &eNB_mac_inst[mod_id].UE_list;
-  UE_sched_ctrl			*ue_sched_ctl = &UE_list->UE_sched_ctrl[ue_id];
 
   rnti_t rnti = flexran_get_ue_crnti(mod_id,ue_id);
   LTE_eNB_UE_stats *eNB_UE_stats = mac_xface->get_eNB_UE_stats(mod_id,CC_id,rnti);
diff --git a/openair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c b/openair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c
index 89a320f52b8ff9b4e32f95561505c55054f61bf2..9c8b23df07a3545188c260f9fbbe7165dfb0ae93 100644
--- a/openair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c
+++ b/openair2/LAYER2/MAC/flexran_agent_scheduler_dataplane.c
@@ -55,6 +55,8 @@
 #include "flexran.pb-c.h"
 #include "flexran_agent_extern.h"
 
+#include "flexran_agent_common.h"
+
 #include "SIMULATION/TOOLS/defs.h" // for taus
 
 void flexran_apply_dl_scheduling_decisions(mid_t mod_id,