diff --git a/extras/vpnupgrade_amzn.sh b/extras/vpnupgrade_amzn.sh
index 74baebe..27db21c 100755
--- a/extras/vpnupgrade_amzn.sh
+++ b/extras/vpnupgrade_amzn.sh
@@ -120,8 +120,8 @@ EOF
   esac
 }
 
-# shellcheck disable=SC2154,SC2039,SC3047
 start_setup() {
+  # shellcheck disable=SC2154
   trap 'dlo=$dl;dl=$LINENO' DEBUG 2>/dev/null
   trap 'finish $? $((dlo+1))' EXIT
   mkdir -p /opt/src
diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index 61fecfa..ec99397 100755
--- a/extras/vpnupgrade_centos.sh
+++ b/extras/vpnupgrade_centos.sh
@@ -138,8 +138,8 @@ EOF
   esac
 }
 
-# shellcheck disable=SC2154,SC2039,SC3047
 start_setup() {
+  # shellcheck disable=SC2154
   trap 'dlo=$dl;dl=$LINENO' DEBUG 2>/dev/null
   trap 'finish $? $((dlo+1))' EXIT
   mkdir -p /opt/src
diff --git a/extras/vpnupgrade_ubuntu.sh b/extras/vpnupgrade_ubuntu.sh
index 4108077..7885969 100755
--- a/extras/vpnupgrade_ubuntu.sh
+++ b/extras/vpnupgrade_ubuntu.sh
@@ -147,8 +147,8 @@ EOF
   esac
 }
 
-# shellcheck disable=SC2154,SC2039,SC3047
 start_setup() {
+  # shellcheck disable=SC2154
   trap 'dlo=$dl;dl=$LINENO' DEBUG 2>/dev/null
   trap 'finish $? $((dlo+1))' EXIT
   mkdir -p /opt/src
diff --git a/vpnsetup_amzn.sh b/vpnsetup_amzn.sh
index bbb8a3e..3ca9044 100755
--- a/vpnsetup_amzn.sh
+++ b/vpnsetup_amzn.sh
@@ -113,9 +113,9 @@ check_dns() {
   fi
 }
 
-# shellcheck disable=SC2154,SC2039,SC3047
 start_setup() {
   bigecho "VPN setup in progress... Please be patient."
+  # shellcheck disable=SC2154
   trap 'dlo=$dl;dl=$LINENO' DEBUG 2>/dev/null
   trap 'finish $? $((dlo+1))' EXIT
   mkdir -p /opt/src
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index 89f4ac3..a00b9d2 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -132,9 +132,9 @@ check_dns() {
   fi
 }
 
-# shellcheck disable=SC2154,SC2039,SC3047
 start_setup() {
   bigecho "VPN setup in progress... Please be patient."
+  # shellcheck disable=SC2154
   trap 'dlo=$dl;dl=$LINENO' DEBUG 2>/dev/null
   trap 'finish $? $((dlo+1))' EXIT
   mkdir -p /opt/src
diff --git a/vpnsetup_ubuntu.sh b/vpnsetup_ubuntu.sh
index a5c7700..5b40b0e 100755
--- a/vpnsetup_ubuntu.sh
+++ b/vpnsetup_ubuntu.sh
@@ -149,9 +149,9 @@ check_iptables() {
   fi
 }
 
-# shellcheck disable=SC2154,SC2039,SC3047
 start_setup() {
   bigecho "VPN setup in progress... Please be patient."
+  # shellcheck disable=SC2154
   trap 'dlo=$dl;dl=$LINENO' DEBUG 2>/dev/null
   trap 'finish $? $((dlo+1))' EXIT
   mkdir -p /opt/src