diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index fece825..8ac7051 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -509,15 +509,8 @@
 	boolean adjust_cx_exp
 }
 
-type record TestHdlrParamsHandover {
-	SCCP_PAR_Address sccp_addr_msc,
-	SCCP_PAR_Address sccp_addr_bsc
-}
-
 type record TestHdlrParamsMSCPool {
 	integer bssap_idx,
-	SCCP_PAR_Address sccp_addr_msc optional,
-	SCCP_PAR_Address sccp_addr_bsc optional,
 	integer rsl_idx,
 	PDU_ML3_MS_NW l3_info optional
 }
@@ -533,7 +526,8 @@
 	bitstring	expect_mr_s0_s7 optional, /* typically present for AMR codecs */
 	TestHdlrEncrParams encr optional,
 	TestHdlrParamsLcls lcls,
-	TestHdlrParamsHandover handover optional,
+	SCCP_PAR_Address sccp_addr_msc optional,
+	SCCP_PAR_Address sccp_addr_bsc optional,
 	uint5_t 	exp_ms_power_level,
 	boolean         exp_ms_power_params,
 	boolean		aoip,
@@ -561,15 +555,14 @@
 		exp_sts := omit,
 		adjust_cx_exp := true
 	},
-	handover := omit,
+	sccp_addr_msc := omit,
+	sccp_addr_bsc := omit,
 	exp_ms_power_level := 7, /* calculated from osmo-bsc.cfg "ms max power" */
 	exp_ms_power_params := false,
 	aoip := true,
 	use_osmux := false,
 	mscpool := {
 		bssap_idx := 0,
-		sccp_addr_msc := omit,
-		sccp_addr_bsc := omit,
 		rsl_idx := 0,
 		l3_info := omit
 	}