diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp
index e995e8d..f84fd34 100644
--- a/library/RAN_Adapter.ttcnpp
+++ b/library/RAN_Adapter.ttcnpp
@@ -47,6 +47,7 @@
 	MSC_SCCP_MTP3_parameters sccp_pars,
 	SCCP_PAR_Address sccp_addr_own,
 	SCCP_PAR_Address sccp_addr_peer,
+	RAN_Transport transport,
 
 	/* handler mode */
 	RAN_Emulation_CT vc_RAN
@@ -79,6 +80,7 @@
 	};
 	ba.sccp_addr_own := valueof(ts_SccpAddr_PC_SSN(cfg.own_pc, cfg.own_ssn, cfg.sio, cfg.sccp_service_type));
 	ba.sccp_addr_peer := valueof(ts_SccpAddr_PC_SSN(cfg.peer_pc, cfg.peer_ssn, cfg.sio, cfg.sccp_service_type));
+	ba.transport := cfg.transport;
 }
 
 
@@ -92,6 +94,8 @@
 	ba.vc_SCCP := SCCP_CT.create(id & "-SCCP");
 	if (isvalue(ops)) {
 		ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN");
+	} else {
+		ba.vc_RAN := null;
 	}
 	select (cfg.transport) {
 	case (BSSAP_TRANSPORT_AoIP, RANAP_TRANSPORT_IuCS) {
@@ -186,5 +190,27 @@
 	ba.vc_SCCP.start(SCCPStart(ba.sccp_pars));
 }
 
+function f_ran_adapter_cleanup(inout RAN_Adapter ba) {
+	if (ba.vc_RAN != null) {
+		if (ba.transport == RANAP_TRANSPORT_IuCS) {
+#ifdef RAN_EMULATION_RANAP
+			disconnect(ba.vc_RAN:RANAP, ba.vc_SCCP:SCCP_SP_PORT);
+#endif
+		} else {
+#ifdef RAN_EMULATION_BSSAP
+			disconnect(ba.vc_RAN:BSSAP, ba.vc_SCCP:SCCP_SP_PORT);
+#endif
+		}
+		ba.vc_RAN.stop;
+	}
+	if (ba.transport == BSSAP_TRANSPORT_AoIP or
+	    ba.transport == RANAP_TRANSPORT_IuCS) {
+		unmap(ba.vc_M3UA:SCTP_PORT, system:sctp);
+		disconnect(ba.vc_M3UA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT);
+		ba.vc_M3UA.stop;
+	}
+	ba.vc_SCCP.stop;
+}
+
 
 }