diff --git a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
index bed97e47c6..fb123134f8 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
@@ -541,7 +541,6 @@ schedule_dlsch(module_id_t module_idP,
     }
 
     // Run each enabled slice-specific schedulers one by one
-    /* TODO Navid took out the dl_info additional information */
     slice_sched_dl[i](module_idP, i, frameP, subframeP, mbsfn_flag/*, dl_info*/);
   }
 
diff --git a/openair2/LAYER2/MAC/proto.h b/openair2/LAYER2/MAC/proto.h
index c0d294ded6..be09385ac9 100644
--- a/openair2/LAYER2/MAC/proto.h
+++ b/openair2/LAYER2/MAC/proto.h
@@ -38,23 +38,18 @@
 /**
  * slice specific scheduler
  */
-/* TODO Navid: Protocol__FlexranMessage -> unknown when compiling without
- * FlexRAN, what to do with it? Matches schedule_ue_spec now */
 typedef void (*slice_scheduler_dl)(module_id_t mod_id,
 				   slice_id_t  slice_id,
 				   frame_t     frame,
 				   sub_frame_t subframe,
-				   int        *mbsfn_flag
-                                /* Protocol__FlexranMessage **dl_info*/);
+				   int        *mbsfn_flag);
 
-/* TODO Navid: the same as above, matches schedule_ulsch_rnti now */
 typedef void (*slice_scheduler_ul)(module_id_t mod_id,
                                    slice_id_t  slice_id,
 				   frame_t       frame,
 				   sub_frame_t   subframe,
 				   unsigned char sched_subframe,
-                                   uint16_t     *first_rb
-                                   /* Protocol__FlexranMessage **ul_info*/);
+                                   uint16_t     *first_rb);
 
 /** \fn void schedule_mib(module_id_t module_idP,frame_t frameP,sub_frame_t subframe);
 \brief MIB scheduling for PBCH. This function requests the MIB from RRC and provides it to L1.
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 6f35f28ebd..c49b9283e2 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -3362,7 +3362,6 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t* cons
 }
 
 #if defined(FLEXRAN_AGENT_SB_IF)
-/* TODO Navid: does this belong here? */
 //-----------------------------------------------------------------------------
 void
 flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t* const ctxt_pP,