diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index cbb6cda..1bda189 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -171,8 +171,7 @@
 
 function f_pcuif_rx_imm_ass(out GsmRrMessage rr_imm_ass,
 			    template PCUIF_Sapi sapi := PCU_IF_SAPI_AGCH,
-			    template GsmRrMessage t_imm_ass := ?,
-			    uint8_t bts_nr := 0)
+			    template GsmRrMessage t_imm_ass := ?)
 runs on MS_BTS_IFACE_CT return boolean {
 	var PCUIF_Message pcu_msg;
 	var octetstring data;
@@ -180,7 +179,7 @@
 
 	T.start(2.0);
 	alt {
-	[] BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := bts_nr, trx_nr := 0, ts_nr := 0,
+	[] BTS.receive(tr_PCUIF_DATA_REQ(bts_nr := 0, trx_nr := 0, ts_nr := 0,
 					 sapi := sapi, data := ?)) -> value pcu_msg {
 		/* On PCH the payload is prefixed with paging group (3 octets): skip it.
 		 * TODO: add an additional template parameter, so we can match it. */
@@ -213,7 +212,7 @@
 const BIT8 chan_req_def := '01111000'B;
 
 /* Establish an Uplink TBF by sending RACH.ind towards the PCU */
-function f_establish_tbf(out GsmRrMessage rr_imm_ass, uint8_t bts_nr := 0,
+function f_establish_tbf(out GsmRrMessage rr_imm_ass,
 			 uint16_t ra := bit2int(chan_req_def),
 			 uint8_t is_11bit := 0,
 			 PCUIF_BurstType burst_type := BURST_TYPE_0,
@@ -226,7 +225,7 @@
 
 	/* Send RACH.ind */
 	log("Sending RACH.ind on fn=", fn, " with RA=", ra, ", TA=", ta);
-	BTS.send(ts_PCUIF_RACH_IND(bts_nr := bts_nr, trx_nr := 0, ts_nr := 0,
+	BTS.send(ts_PCUIF_RACH_IND(bts_nr := 0, trx_nr := 0, ts_nr := 0,
 				   ra := ra, is_11bit := is_11bit,
 				   burst_type := burst_type,
 				   fn := fn, arfcn := 871,
@@ -239,8 +238,7 @@
 
 	/* Expect Immediate (TBF) Assignment on TS0/AGCH */
 	return f_pcuif_rx_imm_ass(rr_imm_ass, PCU_IF_SAPI_AGCH,
-				  tr_IMM_TBF_ASS(false, ra, fn),
-				  bts_nr := bts_nr);
+				  tr_IMM_TBF_ASS(false, ra, fn));
 }
 
 function f_imm_ass_verify_ul_tbf_ass(in GsmRrMessage rr_imm_ass, out PacketUlAssign ul_tbf_ass, template PacketUlAssign ul_ass := tr_PacketUlDynAssign)