diff --git a/lib/examples/pdsch_enodeb.c b/lib/examples/pdsch_enodeb.c
index f7f17bc2b..1d807973c 100644
--- a/lib/examples/pdsch_enodeb.c
+++ b/lib/examples/pdsch_enodeb.c
@@ -942,7 +942,8 @@ int main(int argc, char **argv) {
           }
           /* Configure pmch_cfg parameters */
           srslte_ra_dl_grant_t grant;
-          grant.nof_tb = 1;
+          grant.tb_en[0] = true;
+          grant.tb_en[1] = false;
           grant.mcs[0].idx = 2;
           grant.mcs[0].mod = SRSLTE_MOD_QPSK;
           grant.nof_prb = cell.nof_prb;
diff --git a/lib/include/srslte/phy/phch/ra.h b/lib/include/srslte/phy/phch/ra.h
index aef8f4751..e9c402236 100644
--- a/lib/include/srslte/phy/phch/ra.h
+++ b/lib/include/srslte/phy/phch/ra.h
@@ -104,7 +104,6 @@ typedef struct SRSLTE_API {
   uint32_t nof_prb;  
   uint32_t Qm[SRSLTE_MAX_CODEWORDS];
   srslte_ra_mcs_t mcs[SRSLTE_MAX_CODEWORDS];
-  uint32_t nof_tb;
   srslte_sf_t sf_type;
   bool tb_en[SRSLTE_MAX_CODEWORDS];
   uint32_t pinfo;
diff --git a/lib/src/phy/phch/ra.c b/lib/src/phy/phch/ra.c
index 913bd9548..8fe0ef934 100644
--- a/lib/src/phy/phch/ra.c
+++ b/lib/src/phy/phch/ra.c
@@ -526,11 +526,9 @@ static int dl_dci_to_grant_mcs(srslte_ra_dl_dci_t *dci, srslte_ra_dl_grant_t *gr
     grant->mcs[0].tbs = (uint32_t) tbs;
   } else {
     n_prb = grant->nof_prb;
-    grant->nof_tb = 0;
     if (dci->tb_en[0]) {
       grant->mcs[0].idx = dci->mcs_idx;
       grant->mcs[0].tbs = srslte_dl_fill_ra_mcs(&grant->mcs[0], n_prb);
-      grant->nof_tb++;
     } else {
       grant->mcs[0].tbs = 0;
     }
diff --git a/lib/src/phy/phch/test/pmch_test.c b/lib/src/phy/phch/test/pmch_test.c
index a9c29ef64..bf415e692 100644
--- a/lib/src/phy/phch/test/pmch_test.c
+++ b/lib/src/phy/phch/test/pmch_test.c
@@ -167,7 +167,6 @@ int main(int argc, char **argv) {
   /* If transport block 0 is enabled */
     grant.tb_en[0] = true;
     grant.tb_en[1] = false;
-    grant.nof_tb = 1;
     grant.mcs[0].idx = mcs_idx;
 
     grant.nof_prb = cell.nof_prb;
diff --git a/lib/src/phy/ue/ue_dl.c b/lib/src/phy/ue/ue_dl.c
index 930fe2623..1c3b79440 100644
--- a/lib/src/phy/ue/ue_dl.c
+++ b/lib/src/phy/ue/ue_dl.c
@@ -608,7 +608,6 @@ int srslte_ue_dl_decode_mbsfn(srslte_ue_dl_t * q,
   //float noise_estimate = 0; 
 
   grant.sf_type = SRSLTE_SF_MBSFN;
-  grant.nof_tb = 1;
   grant.mcs[0].idx = 2;
   grant.tb_en[0] = true;
   grant.tb_en[1] = false;