diff --git a/pcu/SGSN_Components.ttcn b/pcu/SGSN_Components.ttcn
index 7bf8705..f2e6967 100644
--- a/pcu/SGSN_Components.ttcn
+++ b/pcu/SGSN_Components.ttcn
@@ -77,8 +77,6 @@
 	connect(self:BSSGP_PROC[0], bssgp_component:BSSGP_PROC);
 	/* connect lower-end of BSSGP with BSSGP_CODEC_PORT (maps to NS_PT*/
 	connect(bssgp_component:BSCP, ns_component:NS_SP);
-	/* connect lower-end of NS emulation to NS_CODEC_PORT (on top of IPl4) */
-	map(ns_component:NSCP, system:NS_CODEC_PORT);
 	ns_component.start(NSStart(mp_nsconfig));
 	bssgp_component.start(BssgpStart(mp_gb_cfg));
 
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index ec18b53..870e66f 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -205,8 +205,6 @@
 	gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP" & int2str(offset));
 	/* connect lower end of BSSGP emulation with NS upper port */
 	connect(gb.vc_BSSGP:BSCP, gb.vc_NS:NS_SP);
-	/* connect lower end of NS emulation to NS codec port (on top of IPL4) */
-	map(gb.vc_NS:NSCP, system:NS_CODEC_PORT);
 
 	gb.vc_NS.start(NSStart(mp_nsconfig[offset]));
 	gb.vc_BSSGP.start(BssgpStart(gb.cfg));