diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index a84277f..518f9e1 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -650,11 +650,7 @@
 		}
 	} else {
 		var BSSMAP_IE_CircuitIdentityCode cic := valueof(ts_BSSMAP_IE_CIC(0,1));
-		if (osmux_enabled) {
-			ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit, osmux_cid));
-		} else {
-			ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit));
-		}
+		ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit));
 	}
 	return ass_cmd;
 }
@@ -684,11 +680,7 @@
 		}
 	} else {
 		/* CIC is optional "*" as the MSC allocated it */
-		if (expect_osmux) {
-			exp_compl := tr_BSSMAP_AssignmentComplete(*, omit, osmux_cid);
-		} else {
-			exp_compl := tr_BSSMAP_AssignmentComplete(*, omit);
-		}
+		exp_compl := tr_BSSMAP_AssignmentComplete(*, omit);
 	}
 	return exp_compl;
 }