diff --git a/files/www/cgi-bin/ucifunc.pm b/files/www/cgi-bin/ucifunc.pm
index 7cb42c6f..8c6d88b7 100644
--- a/files/www/cgi-bin/ucifunc.pm
+++ b/files/www/cgi-bin/ucifunc.pm
@@ -260,17 +260,6 @@ sub uci_revert()
 }
 
 ### UCI Helpers END ###
-sub DEBUGEXIT()
-{
-    my ($text) = @_;
-    http_header();
-    html_header("$node setup", 1);
-    print "DEBUG-";
-    print $text;
-    print "</body>";
-    exit;
-}
-
 
 #weird uhttpd/busybox error requires a 1 at the end of this file
 1
diff --git a/files/www/cgi-bin/vpn b/files/www/cgi-bin/vpn
index f35696ca..39dc6f95 100755
--- a/files/www/cgi-bin/vpn
+++ b/files/www/cgi-bin/vpn
@@ -43,8 +43,6 @@ $VPNVER="1.0";
 $config = nvram_get("config");
 $node = nvram_get("node");
 $node = "NOCALL" if $node eq "";
-$unode = uc $node;   # UPPER CASE NODENAME
-#$tun_server_start_num=50;
 
 read_postdata();
 
@@ -194,7 +192,7 @@ $rc=save_clients();
 #################
 # save configuration (commit)
 #################
-if($parms{button_save} and not (@cli_err or @serv_err))
+if($parms{button_save} and not @cli_err)
 {
     if (&uci_commit("vtun"))
     {
diff --git a/files/www/cgi-bin/vpnc b/files/www/cgi-bin/vpnc
index eabe1fd9..c4ebc07a 100755
--- a/files/www/cgi-bin/vpnc
+++ b/files/www/cgi-bin/vpnc
@@ -43,8 +43,6 @@ $VPNVER="1.0";
 $config = nvram_get("config");
 $node = nvram_get("node");
 $node = "NOCALL" if $node eq "";
-$unode = uc $node;   # UPPER CASE NODENAME
-$tun_client_start_num=60;
 
 read_postdata();
 
@@ -172,7 +170,7 @@ $rc=save_connections();
 #################
 # SAVE the connections the UCI vtun file
 #################
-if($parms{button_save} and not (@conn_err or @serv_err))
+if($parms{button_save} and not @conn_err)
 {
    if (&uci_commit("vtun"))
     {