Remove all gNB num_cc parameters in MACRLCs and L1s sections

These parameters are not used.
2026-07-13 04:30:28 +00:00 · 2026-04-01 21:33:39 +02:00
parent 8a48fca140
commit 7cf92f4bae
125 changed files with 8 additions and 248 deletions
--- a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf
@@ -157,7 +157,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
    local_n_address = "127.0.0.5";
@@ -171,7 +170,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf
@@ -162,7 +162,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
    local_n_address = "192.168.71.171";
@@ -176,7 +175,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf
@@ -191,7 +191,6 @@ rlc = {

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
    local_n_address = "127.0.0.5";
@@ -205,7 +204,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
  pucch0_dtx_threshold = 30;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf
@@ -156,7 +156,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                = 1;
  tr_s_preference       = "local_L1";
  tr_n_preference       = "f1";
  local_n_address       = "172.21.19.98";
@@ -171,7 +170,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 100;
  pucch0_dtx_threshold  = 10;
--- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf
+++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf
@@ -156,7 +156,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                = 1;
  tr_s_preference       = "local_L1";
  tr_n_preference       = "f1";
  local_n_address       = "172.21.19.99";
@@ -171,7 +170,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 100;
  pucch0_dtx_threshold  = 10;
--- a/ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf
+++ b/ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf
@@ -2,7 +2,6 @@

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "nfapi";
  remote_n_address = "192.168.71.140"; // vnf addr
  local_n_address  = "192.168.71.141"; // pnf addr
--- a/ci-scripts/conf_files/gnb-pnf.band77.usrpn310.4x4.conf
+++ b/ci-scripts/conf_files/gnb-pnf.band77.usrpn310.4x4.conf
@@ -4,7 +4,6 @@ usrp-tx-thread-config = 1;
 tune-offset = 30720000;

 L1s = ({
-  num_cc = 1;
  tr_n_preference = "nfapi";
  remote_n_address = "127.0.0.1"; // vnf addr
  local_n_address  = "127.0.0.1"; // pnf addr
--- a/ci-scripts/conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf
@@ -173,7 +173,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "nfapi";
  remote_s_address            = "192.168.71.141"; // pnf addr [!]
  local_s_address             = "192.168.71.140"; // vnf addr
--- a/ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf
@@ -175,7 +175,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference = "nfapi";
  remote_s_address = "127.0.0.1"; // pnf addr [!]
  local_s_address  = "127.0.0.1"; // vnf addr
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -180,7 +180,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc             = 1;
  remote_s_address   = "127.0.0.1"; // pnf addr [!]
  local_s_address    = "127.0.0.2"; // vnf addr
  local_s_portc      = 50001; // vnf p5 port
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf
@@ -180,7 +180,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc           = 1;
  remote_s_address = "127.0.0.1"; // pnf addr [!]
  local_s_address  = "127.0.0.2"; // vnf addr
  local_s_portc    = 50001; // vnf p5 port
--- a/ci-scripts/conf_files/gnb-vnf.sa.band78.78prb.aerial.conf
+++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.78prb.aerial.conf
@@ -179,7 +179,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc           = 1;
  remote_s_address = "127.0.0.1"; // pnf addr [!]
  local_s_address  = "127.0.0.2"; // vnf addr
  local_s_portc    = 50001; // vnf p5 port
--- a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf
@@ -161,7 +161,6 @@ gNBs =

 MACRLCs = (
  {
-  num_cc = 1;
  tr_s_preference = "local_L1";
  tr_n_preference = "local_RRC";
  }
@@ -169,7 +168,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
--- a/ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf
+++ b/ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf
@@ -173,7 +173,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 220;
@@ -184,7 +183,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120
  pucch0_dtx_threshold = 80;
--- a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf
@@ -173,7 +173,6 @@ gNBs =

 MACRLCs = (
 	{
-	num_cc = 1;
 	tr_s_preference = "local_L1";
 	tr_n_preference = "local_RRC";
 	}
@@ -181,7 +180,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
 }
 );
--- a/ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf
@@ -173,7 +173,6 @@ gNBs =

 MACRLCs = (
 	{
-	num_cc = 1;
 	tr_s_preference = "local_L1";
 	tr_n_preference = "local_RRC";
 	}
@@ -181,7 +180,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
 }
 );
--- a/ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf
@@ -170,13 +170,11 @@ gNBs =
 );

 MACRLCs = ({
-  num_cc = 1;
  tr_s_preference = "local_L1";
  tr_n_preference = "local_RRC";
 });

 L1s = ({
-  num_cc = 1;
  tr_n_preference = "local_mac";
 });

--- a/ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf
+++ b/ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf
@@ -172,13 +172,11 @@ gNBs =
 );

 MACRLCs = ({
-  num_cc = 1;
  tr_s_preference = "local_L1";
  tr_n_preference = "local_RRC";
 });

 L1s = ({
-  num_cc = 1;
  tr_n_preference = "local_mac";
 });

--- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf
@@ -180,7 +180,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc              = 1;
    tr_s_preference     = "local_L1";
    tr_n_preference     = "local_RRC";
    pusch_TargetSNRx10  = 200;
@@ -190,7 +189,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
--- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf
+++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf
@@ -197,7 +197,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -209,7 +208,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 150;
  pucch0_dtx_threshold  = 150;
--- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf
@@ -205,7 +205,6 @@ rlc = {

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -217,7 +216,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 150;
  pucch0_dtx_threshold  = 150;
--- a/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf
@@ -172,7 +172,6 @@ gNBs =
 );

 MACRLCs = ({
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -185,7 +184,6 @@ MACRLCs = ({

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold   = 120;
  #pucch0_dtx_threshold = 120;
--- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
@@ -172,7 +172,6 @@ gNBs =

 MACRLCs = (
    {
-        num_cc                      = 1;
        tr_s_preference             = "local_L1";
        tr_n_preference             = "local_RRC";
        ulsch_max_slots_inactivity  = 100;
@@ -183,7 +182,6 @@ MACRLCs = (

 L1s = (
    {
-        num_cc = 1;
        tr_n_preference = "local_mac";
        pusch_proc_threads = 8;
        prach_dtx_threshold = 200;
--- a/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
@@ -178,7 +178,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 320;
@@ -192,7 +191,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
  pusch_dtx_threshold = 20;
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
@@ -174,7 +174,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -185,7 +184,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 130
  pucch0_dtx_threshold = 80;
--- a/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf
@@ -171,7 +171,6 @@ gNBs = (

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 320;
@@ -185,7 +184,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
  max_ldpc_iterations = 15;
--- a/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf
+++ b/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf
@@ -171,7 +171,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -182,7 +181,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 100;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf
@@ -174,7 +174,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc           = 1;
  tr_s_preference  = "local_L1";
  tr_n_preference  = "local_RRC";
  pusch_TargetSNRx10 = 150;
@@ -184,7 +183,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 150;
  #pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf
@@ -176,7 +176,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -186,7 +185,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
 #  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf
@@ -166,7 +166,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc             = 1;
    tr_s_preference    = "local_L1";
    tr_n_preference    = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -176,7 +175,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc                = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 200;
 #  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf
@@ -174,7 +174,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 250;
@@ -184,7 +183,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 100;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf
@@ -167,7 +167,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc           = 1;
  tr_s_preference  = "local_L1";
  tr_n_preference  = "local_RRC";
  pusch_TargetSNRx10 = 200;
@@ -197,7 +196,6 @@ prs_config = (

 L1s = (
 {
-  num_cc              = 1;
  tr_n_preference     = "local_mac";
  prach_dtx_threshold = 120;
 }
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml
@@ -143,16 +143,14 @@ gNBs:


 MACRLCs:
-  - num_cc: 1
-    tr_s_preference: local_L1
+  - tr_s_preference: local_L1
    tr_n_preference: local_RRC
    pusch_TargetSNRx10: 200
    pucch_TargetSNRx10: 200
    stats_max_ue: 17

 L1s:
-  - num_cc: 1
-    tr_n_preference:  local_mac
+  - tr_n_preference:  local_mac
    prach_dtx_threshold: 200
    # pucch0_dtx_threshold = 150;

--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf
@@ -178,7 +178,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -189,7 +188,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 150;
  pucch0_dtx_threshold  = 30;
--- a/ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml
+++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml
@@ -146,15 +146,13 @@ gNBs:


 MACRLCs:
-  - num_cc: 1
-    tr_s_preference: local_L1
+  - tr_s_preference: local_L1
    tr_n_preference: local_RRC
    pusch_TargetSNRx10: 200
    pucch_TargetSNRx10: 200

 L1s:
-  - num_cc: 1
-    tr_n_preference:  local_mac
+  - tr_n_preference:  local_mac
    prach_dtx_threshold: 200
    # pucch0_dtx_threshold = 150;

--- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf
@@ -169,7 +169,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -179,7 +178,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  pusch_proc_threads    = 8;
  prach_dtx_threshold   = 120;
--- a/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf
@@ -173,7 +173,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
 }
@@ -181,7 +180,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc                = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  tx_amp_backoff_dB = 30;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf
@@ -177,7 +177,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -187,7 +186,6 @@ MACRLCs = (

 L1s = (
        {
-        num_cc = 1;
        tr_n_preference = "local_mac";
        prach_dtx_threshold = 120;
        pucch0_dtx_threshold = 50;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf
@@ -179,7 +179,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -190,7 +189,6 @@ MACRLCs = (

 L1s = (
        {
-        num_cc = 1;
        tr_n_preference = "local_mac";
        prach_dtx_threshold = 120;
        pucch0_dtx_threshold = 50;
--- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf
@@ -168,7 +168,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -179,7 +178,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 100;
--- a/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
+++ b/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf
@@ -19,7 +19,6 @@ pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });

 MACRLCs = (
        {
-        num_cc = 1;
        tr_n_preference = "nfapi";
        remote_n_address = "127.0.0.1"; //Proxy IP
        local_n_address  = "127.0.0.1";
--- a/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf
@@ -188,7 +188,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -198,7 +197,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf
@@ -184,7 +184,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -194,7 +193,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
 }
--- a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -192,7 +192,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 200;
@@ -202,7 +201,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
 #  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf
@@ -179,7 +179,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc              = 1;
    tr_s_preference     = "local_L1";
    tr_n_preference     = "local_RRC";
    pusch_TargetSNRx10  = 200;
@@ -189,7 +188,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
 }
--- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf
@@ -183,7 +183,6 @@ gNBs =

 MACRLCs = (
    {
-        num_cc              = 1;
        tr_s_preference     = "local_L1";
        tr_n_preference     = "local_RRC";
        pusch_TargetSNRx10  = 200;
@@ -193,7 +192,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
 }
 );
--- a/ci-scripts/conf_files/untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf
@@ -184,7 +184,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                     = 1;
  tr_s_preference            = "local_L1";
  tr_n_preference            = "local_RRC";
 }
@@ -192,7 +191,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
  pucch0_dtx_threshold = 80;
--- a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
@@ -172,7 +172,6 @@ gNBs =

 MACRLCs = (
    {
-        num_cc                      = 1;
        tr_s_preference             = "local_L1";
        tr_n_preference             = "local_RRC";
        ulsch_max_slots_inactivity  = 100;
@@ -183,7 +182,6 @@ MACRLCs = (

 L1s = (
    {
-        num_cc = 1;
        tr_n_preference = "local_mac";
        pusch_proc_threads = 8;
        prach_dtx_threshold = 200;
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrp310.2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrp310.2x2.conf
@@ -175,7 +175,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 220;
@@ -185,7 +184,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 150;
 #  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf
@@ -188,7 +188,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    pusch_TargetSNRx10 = 220;
@@ -198,7 +197,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 150;
 #  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.162prb.usrpn310.2x2.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.162prb.usrpn310.2x2.conf
@@ -189,7 +189,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
 #    pusch_TargetSNRx10 = 200;
@@ -199,7 +198,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
 #  pucch0_dtx_threshold = 150;
--- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf
@@ -167,7 +167,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -178,7 +177,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 100;
--- a/doc/LDPC_OFFLOAD_SETUP.md
+++ b/doc/LDPC_OFFLOAD_SETUP.md
@@ -305,7 +305,6 @@ Example configuration snippet:
 ...
 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 180;
@@ -322,7 +321,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 100;
--- a/doc/testing_oai_nsa_w_cots_ue_resources/gnb.conf
+++ b/doc/testing_oai_nsa_w_cots_ue_resources/gnb.conf
@@ -183,7 +183,6 @@ gNBs =

 MACRLCs = (
 	{
-	num_cc = 1;
 	tr_s_preference = "local_L1";
 	tr_n_preference = "local_RRC";
        }  
@@ -191,7 +190,6 @@ MACRLCs = (

 L1s = (
    	{
-	num_cc = 1;
 	tr_n_preference = "local_mac";
        }  
 );
--- a/openair2/GNB_APP/L1_nr_paramdef.h
+++ b/openair2/GNB_APP/L1_nr_paramdef.h
@@ -13,7 +13,6 @@


 /* L1 configuration parameters names   */
-#define L1_CC                                "num_cc"
 #define L1_LOCAL_N_ADDRESS                   "local_n_address"
 #define L1_REMOTE_N_ADDRESS                  "remote_n_address"
 #define L1_LOCAL_N_PORTC                     "local_n_portc"
@@ -45,7 +44,6 @@
 /*----------------------------------------------------------------------------------------------------------------------------------------------------*/
 // clang-format off
 #define L1PARAMS_DESC { \
-  {L1_CC,                                NULL,       0,         .uptr=NULL,           .defintval=1,               TYPE_UINT,     0},         \
  {L1_TRANSPORT_N_PREFERENCE,            NULL,       0,         .strptr=NULL,         .defstrval="local_mac",     TYPE_STRING,   0},         \
  {L1_LOCAL_N_ADDRESS,                   NULL,       0,         .strptr=NULL,         .defstrval="127.0.0.1",     TYPE_STRING,   0},         \
  {L1_REMOTE_N_ADDRESS,                  NULL,       0,         .strptr=NULL,         .defstrval="127.0.0.2",     TYPE_STRING,   0},         \
--- a/openair2/GNB_APP/MACRLC_nr_paramdef.h
+++ b/openair2/GNB_APP/MACRLC_nr_paramdef.h
@@ -15,7 +15,6 @@
 #define MACRLC_LIST                          "MACRLCs"

 /* MACRLC configuration parameters names   */
-#define MACRLC_CC                            "num_cc"
 #define MACRLC_TRANSPORT_N_PREFERENCE        "tr_n_preference"
 #define MACRLC_LOCAL_N_ADDRESS               "local_n_address"
 #define MACRLC_LOCAL_N_ADDRESS_F1U           "local_n_address_f1u"
@@ -87,7 +86,6 @@
 /*-------------------------------------------------------------------------------------------------------------------------------------------------------*/
 // clang-format off
 #define MACRLCPARAMS_DESC { \
-  {MACRLC_CC,                          NULL,                     0, .uptr=NULL,   .defintval=50011,           TYPE_UINT,    0}, \
  {MACRLC_TRANSPORT_N_PREFERENCE,      NULL,                     0, .strptr=NULL, .defstrval="local_L1",      TYPE_STRING,  0}, \
  {MACRLC_LOCAL_N_ADDRESS,             NULL,                     0, .strptr=NULL, .defstrval="127.0.0.1",     TYPE_STRING,  0}, \
  {MACRLC_REMOTE_N_ADDRESS,            NULL,                     0, .uptr=NULL,   .defstrval="127.0.0.2",     TYPE_STRING,  0}, \
@@ -159,7 +157,6 @@
  { .s5 = { NULL } }, \
  { .s5 = { NULL } }, \
  { .s5 = { NULL } }, \
-  { .s5 = { NULL } }, \
  { .s2 = { config_check_intrange, {0, 31} } }, /* DL min MCS */ \
  { .s2 = { config_check_intrange, {0, 31} } }, /* DL max MCS */ \
  { .s5 = { NULL } }, \
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
@@ -162,7 +162,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "f1";
    local_n_address = "127.0.0.3";
@@ -175,7 +174,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
  pucch0_dtx_threshold = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci0.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci0.conf
@@ -158,7 +158,6 @@ gNBs =
 );

 MACRLCs = ({
-    num_cc              = 1;
    tr_s_preference     = "local_L1";
    tr_n_preference     = "f1";
    local_n_address     = "127.0.0.4";
@@ -169,7 +168,6 @@ MACRLCs = ({
 });

 L1s = ({
-    num_cc = 1;
    tr_n_preference = "local_mac";
    prach_dtx_threshold = 200;
    pucch0_dtx_threshold = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci1.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci1.conf
@@ -158,7 +158,6 @@ gNBs =
 );

 MACRLCs = ({
-    num_cc              = 1;
    tr_s_preference     = "local_L1";
    tr_n_preference     = "f1";
    local_n_address     = "127.0.0.5";
@@ -169,7 +168,6 @@ MACRLCs = ({
 });

 L1s = ({
-    num_cc = 1;
    tr_n_preference = "local_mac";
    prach_dtx_threshold = 200;
    pucch0_dtx_threshold = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf
@@ -167,7 +167,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "f1";
  local_n_address             = "172.21.16.51";
@@ -188,7 +187,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 100;
  pucch0_dtx_threshold = 80;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-das-benetel650_650.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-das-benetel650_650.conf
@@ -167,7 +167,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "f1";
  local_n_address             = "172.21.16.51";
@@ -192,7 +191,6 @@ MACRLCs = (
 L1s = (
 {
  enable_das = 1;
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 100;
  pucch0_dtx_threshold = 80;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650-mplane.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650-mplane.conf
@@ -167,7 +167,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "f1";
  local_n_address             = "172.21.16.51";
@@ -188,7 +187,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 100;
  pucch0_dtx_threshold = 80;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf
@@ -167,7 +167,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "f1";
  local_n_address             = "172.21.16.51";
@@ -188,7 +187,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 100;
  pucch0_dtx_threshold = 80;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci0.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci0.conf
@@ -156,7 +156,6 @@ gNBs =
 );

 MACRLCs = ({
-    num_cc              = 1;
    tr_s_preference     = "local_L1";
    tr_n_preference     = "f1";
    local_n_address     = "127.0.0.4";
@@ -167,7 +166,6 @@ MACRLCs = ({
 });

 L1s = ({
-    num_cc = 1;
    tr_n_preference = "local_mac";
    prach_dtx_threshold = 200;
    pucch0_dtx_threshold = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf
@@ -156,7 +156,6 @@ gNBs =
 );

 MACRLCs = ({
-    num_cc              = 1;
    tr_s_preference     = "local_L1";
    tr_n_preference     = "f1";
    local_n_address     = "127.0.0.5";
@@ -167,7 +166,6 @@ MACRLCs = ({
 });

 L1s = ({
-    num_cc = 1;
    tr_n_preference = "local_mac";
    prach_dtx_threshold = 200;
    pucch0_dtx_threshold = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.2x2.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.2x2.conf
@@ -7,7 +7,6 @@ log_config = {
 };

 L1s = ({
-  num_cc = 1;
  tr_n_preference  = "nfapi";
  remote_n_address = "127.0.0.1"; // vnf addr
  local_n_address  = "127.0.0.1"; // pnf addr
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.conf
@@ -7,7 +7,6 @@ log_config = {
 };

 L1s = ({
-	num_cc = 1;
 	tr_n_preference  = "nfapi";
  remote_n_address = "127.0.0.1"; // vnf addr
  local_n_address  = "127.0.0.1"; // pnf addr
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.106prb.nfapi.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.106prb.nfapi.conf
@@ -175,7 +175,6 @@ gNBs =

 MACRLCs = (
        {
-        num_cc = 1;
        remote_s_address = "127.0.0.1"; // pnf addr [!]
        local_s_address  = "127.0.0.1"; // vnf addr
        local_s_portc    = 50001; // vnf p5 port
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf
@@ -177,7 +177,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc             = 1;
  remote_s_address   = "127.0.0.1"; // pnf addr [!]
  local_s_address    = "127.0.0.2"; // vnf addr
  local_s_portc      = 50001; // vnf p5 port
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.nfapi.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.nfapi.conf
@@ -179,7 +179,6 @@ gNBs =

 MACRLCs = (
        {
-        num_cc = 1;
        remote_s_address = "127.0.0.1"; // pnf addr [!]
        local_s_address  = "127.0.0.2"; // vnf addr
        local_s_portc    = 50001; // vnf p5 port
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.cbrs.aerial.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.cbrs.aerial.conf
@@ -177,7 +177,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc           = 1;
  local_s_if_name  = "lo:";
  remote_s_address = "127.0.0.1"; // pnf addr [!]
  local_s_address  = "127.0.0.2"; // vnf addr
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
@@ -204,7 +204,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
 #    pusch_TargetSNRx10 = 200;
@@ -214,7 +213,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
 #  pucch0_dtx_threshold = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
@@ -208,7 +208,6 @@ gNBs =

 MACRLCs = (
  {
-    num_cc           = 1;
    tr_s_preference  = "local_L1";
    tr_n_preference  = "local_RRC";
    #pusch_TargetSNRx10 = 200;
@@ -218,7 +217,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
 #  pucch0_dtx_threshold = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf
@@ -166,7 +166,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -176,7 +175,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 100;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band254.ntn.mu1.24prb.rfsim.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band254.ntn.mu1.24prb.rfsim.conf
@@ -193,7 +193,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -203,7 +202,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band255.ntn.mu0.25prb.rfsim.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band255.ntn.mu0.25prb.rfsim.conf
@@ -192,7 +192,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -202,7 +201,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band256.ntn.mu0.25prb.rfsim.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band256.ntn.mu0.25prb.rfsim.conf
@@ -192,7 +192,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -202,7 +201,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.66prb.fhi72.2x2-liteon.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.66prb.fhi72.2x2-liteon.conf
@@ -175,7 +175,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -194,7 +193,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 250;
  pucch0_dtx_threshold = 100;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf
@@ -173,7 +173,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  #pusch_TargetSNRx10         = 150;
@@ -183,7 +182,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc                = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  #pucch0_dtx_threshold = 120;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
@@ -170,7 +170,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -183,7 +182,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 100;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf
@@ -175,7 +175,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -185,7 +184,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  pusch_proc_threads    = 8;
  prach_dtx_threshold   = 120;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.132prb.rfsim.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.132prb.rfsim.conf
@@ -205,7 +205,6 @@ rlc = {

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
 }
@@ -213,7 +212,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc                = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
 }
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.32prb.rfsim.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.32prb.rfsim.conf
@@ -207,7 +207,6 @@ rlc = {

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
 }
@@ -215,7 +214,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc                = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
 }
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.66prb.rfsim.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.66prb.rfsim.conf
@@ -206,7 +206,6 @@ rlc = {

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
 }
@@ -214,7 +213,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc                = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
 }
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
@@ -171,7 +171,6 @@ gNBs =

 MACRLCs = (
    {
-        num_cc                      = 1;
        tr_s_preference             = "local_L1";
        tr_n_preference             = "local_RRC";
        ulsch_max_slots_inactivity  = 100;
@@ -182,7 +181,6 @@ MACRLCs = (

 L1s = (
    {
-        num_cc = 1;
        tr_n_preference = "local_mac";
        pusch_proc_threads = 8;
  ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf
@@ -186,7 +186,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -196,7 +195,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf
@@ -220,7 +220,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -232,7 +231,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 150;
  pucch0_dtx_threshold  = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf
@@ -220,7 +220,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -232,7 +231,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 150;
  pucch0_dtx_threshold  = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.u0.25prb.rfsim.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.u0.25prb.rfsim.conf
@@ -171,7 +171,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -181,7 +180,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 150;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf
@@ -175,7 +175,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 200;
@@ -190,7 +189,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 110;
  pucch0_dtx_threshold = 80;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.162prb.usrpn310.4x4.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.162prb.usrpn310.4x4.conf
@@ -178,7 +178,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 250;
@@ -190,7 +189,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
  pusch_dtx_threshold = 20;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-benetel550-long-prach.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-benetel550-long-prach.conf
@@ -174,7 +174,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 180;
@@ -190,7 +189,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 100;
  pucch0_dtx_threshold = 10;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn-16b.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn-16b.conf
@@ -172,7 +172,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 180;
@@ -187,7 +186,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 130
  pucch0_dtx_threshold = 80;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf
@@ -174,7 +174,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 180;
@@ -189,7 +188,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 130
  pucch0_dtx_threshold = 80;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf
@@ -170,7 +170,6 @@ gNBs = (

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 300;
@@ -181,7 +180,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
  pucch0_dtx_threshold = 80;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf
@@ -170,7 +170,6 @@ gNBs = (

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 300;
@@ -181,7 +180,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 120;
  pucch0_dtx_threshold = 80;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106PRB.usrpb210.RA_2-Step.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106PRB.usrpb210.RA_2-Step.conf
@@ -194,7 +194,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 150;
@@ -204,7 +203,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference       = "local_mac";
  prach_dtx_threshold   = 120;
  pucch0_dtx_threshold  = 100;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.bladerf2.0xa4.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.bladerf2.0xa4.conf
@@ -171,7 +171,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc           = 1;
  tr_s_preference  = "local_L1";
  tr_n_preference  = "local_RRC";
  pusch_TargetSNRx10 = 200;
@@ -181,7 +180,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
 }
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.fhi72.1x1-proto-ru.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.fhi72.1x1-proto-ru.conf
@@ -174,7 +174,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 250;
@@ -189,7 +188,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 200;
  pucch0_dtx_threshold = 100;
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.2x2-benetel550-16b.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.2x2-benetel550-16b.conf
@@ -175,7 +175,6 @@ gNBs =

 MACRLCs = (
 {
-  num_cc                      = 1;
  tr_s_preference             = "local_L1";
  tr_n_preference             = "local_RRC";
  pusch_TargetSNRx10          = 180;
@@ -191,7 +190,6 @@ MACRLCs = (

 L1s = (
 {
-  num_cc = 1;
  tr_n_preference = "local_mac";
  prach_dtx_threshold = 100;
  pucch0_dtx_threshold = 80;
--- a/Show More
+++ b/Show More