diff --git a/srsenb/src/phy/phy_ue_db.cc b/srsenb/src/phy/phy_ue_db.cc
index 9e86a60d1..9d6761a8f 100644
--- a/srsenb/src/phy/phy_ue_db.cc
+++ b/srsenb/src/phy/phy_ue_db.cc
@@ -784,7 +784,7 @@ int phy_ue_db::set_ul_grant_available(uint32_t tti, const stack_interface_phy_lt
       // Check that eNb Cell/Carrier is active for the given RNTI
       if (_assert_active_enb_cc(rnti, enb_cc_idx) != SRSRAN_SUCCESS) {
         ret = SRSRAN_ERROR;
-        srslog::fetch_basic_logger("RRC-NR").error("Error setting grant for rnti=0x%x, cc=%d\n", rnti, enb_cc_idx);
+        srslog::fetch_basic_logger("PHY").error("Error setting grant for rnti=0x%x, cc=%d\n", rnti, enb_cc_idx);
         continue;
       }
       // Rise Grant available flag
diff --git a/srsenb/src/stack/mac/mac.cc b/srsenb/src/stack/mac/mac.cc
index 489ae8af9..ebf520449 100644
--- a/srsenb/src/stack/mac/mac.cc
+++ b/srsenb/src/stack/mac/mac.cc
@@ -216,10 +216,7 @@ int mac::ue_rem(uint16_t rnti)
 int mac::ue_set_crnti(uint16_t temp_crnti, uint16_t crnti, const sched_interface::ue_cfg_t& cfg)
 {
   srsran::rwlock_read_guard lock(rwlock);
-  if (temp_crnti != crnti) {
-    // if C-RNTI is changed, it corresponds to older user. Handover scenario.
-    // ue_db[crnti]->reset();
-  } else {
+  if (temp_crnti == crnti) {
     // Schedule ConRes Msg4
     scheduler.dl_mac_buffer_state(crnti, (uint32_t)srsran::dl_sch_lcid::CON_RES_ID);
   }