diff --git a/dokku b/dokku
index 4ab49bd22..862efa690 100755
--- a/dokku
+++ b/dokku
@@ -88,8 +88,8 @@ fi
 ! has_tty && DOKKU_QUIET_OUTPUT=1
 
 if [[ $(id -un) != "dokku" ]]; then
-  unset DOKKU_PID TMP TMPDIR TEMP TEMPDIR
   if [[ ! $1 =~ plugin:* ]] && [[ $1 != "ssh-keys:add" ]] && [[ $1 != "ssh-keys:remove" ]] && [[ $1 != "scheduler-k3s:initialize" ]] && [[ $1 != "scheduler-k3s:uninstall" ]]; then
+    unset DOKKU_PID TMP TMPDIR TEMP TEMPDIR
     export SSH_USER=$(id -un)
     sudo -u dokku -E -H "$0" "$@"
     exit $?
diff --git a/plugins/nginx-vhosts/nginx-property b/plugins/nginx-vhosts/nginx-property
deleted file mode 100755
index cd48b3c42..000000000
Binary files a/plugins/nginx-vhosts/nginx-property and /dev/null differ