diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index e8551a1..c7b84c9 100755
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -715,6 +715,7 @@ init_vars()
 		fi
 	}
 
+	unset GSNC
 	unset OSARCH
 	unset SRC_PKG
 	# User supplied OSARCH
@@ -953,7 +954,6 @@ init_vars()
 	[[ -n $SHELL ]] && [[ "$("$SHELL" -c "echo TRUE" 2>/dev/null)" != "TRUE" ]] && unset SHELL
 
 	DEBUGF "DL=${DL[*]}"
-	# DEBUGF "OLD_PIDS='$OLD_PIDS'"
 	DEBUGF "SRC_PKG=$SRC_PKG"
 }
 
@@ -1818,7 +1818,7 @@ test_dstbin()
 
 	# Try to execute the binary
 	unset ERR_LOG
-	GS_OUT=$(GS_TEST_DSTBIN=1 GS_CONFIG_READ=0 "${DSTBIN_EXEC_ARR[@]}" -g 2>/dev/null)
+	GS_OUT=$(GS_CONFIG_READ=0 "${DSTBIN_EXEC_ARR[@]}" -g 2>/dev/null)
 	[[ -z "$GS_OUT" ]] && {
 		# 126 - Exec format error
 		FAIL_OUT
@@ -2124,7 +2124,7 @@ gs_start()
 
 	[[ -z $IS_NEED_START ]] && return
 
-	(cd "$HOME"; GS_CONFIG_READ="" "${DSTBIN_EXEC_ARR[@]}") || errexit
+	(cd "$HOME"; unset -v GS_CONFIG_READ; "${DSTBIN_EXEC_ARR[@]}") || errexit
 	IS_GS_RUNNING=1
 }
 
diff --git a/tools/utils.c b/tools/utils.c
index 83d9265..645df00 100644
--- a/tools/utils.c
+++ b/tools/utils.c
@@ -316,9 +316,9 @@ try_changeargv0(int argc, char *argv[]) {
 
 	if (GSNC_config_read(exename) != 0) {
 		DEBUGF("GSNC_config_read() failed\n");
-		// MUST exit if GS_CONFIG_READ=0 is set or otherwise
+		// Logins via GSNC set GS_CONFIG_READ=0 and GSNC. Must exit or otherwise
 		// uname -a is started for every gsnc login
-		if ((!(gopt.flags & GSC_FL_WANT_CONFIG_READ)) && (getenv("GSNC") != NULL) && (getenv("GS_TEST_DSTBIN") == NULL))
+		if ((!(gopt.flags & GSC_FL_WANT_CONFIG_READ)) && (getenv("GSNC") != NULL))
 			exit(0);
 		return;
 	}