diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 4f96567..127029b 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -623,12 +623,15 @@
 	}
 	bts_set_max_cs(bts, bts->vty.max_cs_dl, bts->vty.max_cs_ul); /* recalc max CS values */
 
+	bts->egprs_enabled = false;
 	bts->mcs_mask = 0;
 	for (i = 0; i < 9; i++) {
 		uint8_t allowed = !!(info_ind->flags & (PCU_IF_FLAG_MCS1 << i));
 		bts->mcs_mask |= allowed << i;
-		if (allowed)
+		if (allowed) {
+			bts->egprs_enabled = true;
 			LOGP(DL1IF, LOGL_DEBUG, " Use MCS%d\n", i + 1);
+		}
 	}
 	bts_set_max_mcs(bts, bts->vty.max_mcs_dl, bts->vty.max_mcs_ul); /* recalc max MCS values */
 
diff --git a/src/pcu_vty.c b/src/pcu_vty.c
index bd83544..5e5dfbe 100644
--- a/src/pcu_vty.c
+++ b/src/pcu_vty.c
@@ -108,9 +108,6 @@
 	unsigned int i;
 
 	vty_out(vty, "pcu%s", VTY_NEWLINE);
-	if (bts->egprs_enabled)
-		vty_out(vty, " egprs only%s", VTY_NEWLINE);
-
 	vty_out(vty, " flow-control-interval %d%s", bts->fc_interval,
 		VTY_NEWLINE);
 	if (bts->fc_bvc_bucket_size)
@@ -273,29 +270,21 @@
 
 #define EGPRS_STR "EGPRS configuration\n"
 
-DEFUN_USRATTR(cfg_pcu_egprs,
-	      cfg_pcu_egprs_cmd,
-	      X(PCU_VTY_ATTR_NEW_TBF),
-	      "egprs only",
-	      EGPRS_STR "Use EGPRS and disable plain GPRS\n")
+DEFUN_DEPRECATED(cfg_pcu_egprs,
+		 cfg_pcu_egprs_cmd,
+		 "egprs only",
+		 EGPRS_STR "Use EGPRS and disable plain GPRS\n")
 {
-	struct gprs_rlcmac_bts *bts = bts_main_data();
-
-	bts->egprs_enabled = true;
-
+	vty_out (vty, "'egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE);
 	return CMD_SUCCESS;
 }
 
-DEFUN_USRATTR(cfg_pcu_no_egprs,
-	      cfg_pcu_no_egprs_cmd,
-	      X(PCU_VTY_ATTR_NEW_TBF),
-	      "no egprs",
-	      NO_STR EGPRS_STR)
+DEFUN_DEPRECATED(cfg_pcu_no_egprs,
+		 cfg_pcu_no_egprs_cmd,
+		 "no egprs",
+		 NO_STR EGPRS_STR)
 {
-	struct gprs_rlcmac_bts *bts = bts_main_data();
-
-	bts->egprs_enabled = false;
-
+	vty_out (vty, "'no egprs only' is deprecated, egprs support is controled from BTS/BSC config, this is now a no-op%s", VTY_NEWLINE);
 	return CMD_SUCCESS;
 }