diff --git a/openair2/LAYER2/MAC/pre_processor.c b/openair2/LAYER2/MAC/pre_processor.c
index 8b33cae488165c6cbaf318c67fa3f0e9fb8e184f..37a7b47000e26da2757806d0780eb8565374a4b4 100644
--- a/openair2/LAYER2/MAC/pre_processor.c
+++ b/openair2/LAYER2/MAC/pre_processor.c
@@ -499,78 +499,6 @@ void sort_UEs(module_id_t Mod_idP, int slice_idx, int frameP, sub_frame_t subfra
   } else {
     UE_list->head = -1;
   }
-
-#if 0
-
-
-    int UE_id1, UE_id2;
-    int pCC_id1, pCC_id2;
-    int cqi1, cqi2, round1, round2;
-    int i = 0, ii = 0;		//,j=0;
-    rnti_t rnti1, rnti2;
-
-    UE_list_t *UE_list = &RC.mac[Mod_idP]->UE_list;
-
-    for (i = UE_list->head; i >= 0; i = UE_list->next[i]) {
-
-	for (ii = UE_list->next[i]; ii >= 0; ii = UE_list->next[ii]) {
-
-	    UE_id1 = i;
-	    rnti1 = UE_RNTI(Mod_idP, UE_id1);
-	    if (rnti1 == NOT_A_RNTI)
-		continue;
-	    if (UE_list->UE_sched_ctrl[UE_id1].ul_out_of_sync == 1)
-		continue;
-	    pCC_id1 = UE_PCCID(Mod_idP, UE_id1);
-	    cqi1 = maxcqi(Mod_idP, UE_id1);	//
-	    round1 = maxround(Mod_idP, rnti1, frameP, subframeP, 0);
-
-	    UE_id2 = ii;
-	    rnti2 = UE_RNTI(Mod_idP, UE_id2);
-	    if (rnti2 == NOT_A_RNTI)
-		continue;
-	    if (UE_list->UE_sched_ctrl[UE_id2].ul_out_of_sync == 1)
-		continue;
-	    cqi2 = maxcqi(Mod_idP, UE_id2);
-	    round2 = maxround(Mod_idP, rnti2, frameP, subframeP, 0);	//mac_xface->get_ue_active_harq_pid(Mod_id,rnti2,subframe,&harq_pid2,&round2,0);
-	    pCC_id2 = UE_PCCID(Mod_idP, UE_id2);
-
-	    if (round2 > round1) {	// Check first if one of the UEs has an active HARQ process which needs service and swap order
-		swap_UEs(UE_list, UE_id1, UE_id2, 0);
-	    } else if (round2 == round1) {
-		// RK->NN : I guess this is for fairness in the scheduling. This doesn't make sense unless all UEs have the same configuration of logical channels.  This should be done on the sum of all information that has to be sent.  And still it wouldn't ensure fairness.  It should be based on throughput seen by each UE or maybe using the head_sdu_creation_time, i.e. swap UEs if one is waiting longer for service.
-		//  for(j=0;j<MAX_NUM_LCID;j++){
-		//    if (eNB_mac_inst[Mod_id][pCC_id1].UE_template[UE_id1].dl_buffer_info[j] <
-		//      eNB_mac_inst[Mod_id][pCC_id2].UE_template[UE_id2].dl_buffer_info[j]){
-
-		// first check the buffer status for SRB1 and SRB2
-
-		if ((UE_list->UE_template[pCC_id1][UE_id1].
-		     dl_buffer_info[1] +
-		     UE_list->UE_template[pCC_id1][UE_id1].
-		     dl_buffer_info[2]) <
-		    (UE_list->UE_template[pCC_id2][UE_id2].
-		     dl_buffer_info[1] +
-		     UE_list->UE_template[pCC_id2][UE_id2].
-		     dl_buffer_info[2])) {
-		    swap_UEs(UE_list, UE_id1, UE_id2, 0);
-		} else if (UE_list->UE_template[pCC_id1]
-			   [UE_id1].dl_buffer_head_sdu_creation_time_max <
-			   UE_list->UE_template[pCC_id2]
-			   [UE_id2].dl_buffer_head_sdu_creation_time_max) {
-		    swap_UEs(UE_list, UE_id1, UE_id2, 0);
-		} else if (UE_list->UE_template[pCC_id1][UE_id1].
-			   dl_buffer_total <
-			   UE_list->UE_template[pCC_id2][UE_id2].
-			   dl_buffer_total) {
-		    swap_UEs(UE_list, UE_id1, UE_id2, 0);
-		} else if (cqi1 < cqi2) {
-		    swap_UEs(UE_list, UE_id1, UE_id2, 0);
-		}
-	    }
-	}
-    }
-#endif
 }
 
 void dlsch_scheduler_pre_processor_partitioning(module_id_t Mod_id,