diff --git a/src/gb_proxy_main.c b/src/gb_proxy_main.c
index c660ede..37afb5e 100644
--- a/src/gb_proxy_main.c
+++ b/src/gb_proxy_main.c
@@ -289,7 +289,7 @@
 		exit(1);
 	}
 
-	gprs_ns2_vty_init(gbcfg->nsi, NULL);
+	gprs_ns2_vty2_init(gbcfg->nsi);
 	logging_vty_add_deprecated_subsys(tall_sgsn_ctx, "bssgp");
 	gprs_ns2_dynamic_create_nse(gbcfg->nsi, true);
 
@@ -301,10 +301,6 @@
 		exit(2);
 	}
 
-	gprs_ns2_vty_create();
-
-	/* TODO: Warn if we create a gbproxy_nse for an NSEI which we don't have a bind */
-
 	/* start telnet after reading config for vty_get_bind_addr() */
 	rc = telnet_init_dynif(tall_sgsn_ctx, NULL,
 			       vty_get_bind_addr(), OSMO_VTY_PORT_GBPROXY);