diff --git a/.github/workflows/stargz_tests.yml b/.github/workflows/stargz_tests.yml
index b2173783a..baf453923 100644
--- a/.github/workflows/stargz_tests.yml
+++ b/.github/workflows/stargz_tests.yml
@@ -67,7 +67,7 @@ jobs:
           kubectl patch configmap -n knative-serving config-autoscaler -p "{\"data\": {\"allow-zero-initial-scale\": \"true\"}}"
 
       - name: Setup stock-only node
-        run: ./scripts/setup_tool setup_node stock-only use-stargz
+        run: ./scripts/setup_tool setup_node REGULAR stock-only use-stargz
 
       - name: Check containerd service is running
         run: sudo screen -list | grep "containerd"
diff --git a/scripts/cluster/create_multinode_cluster.go b/scripts/cluster/create_multinode_cluster.go
index 965656b6d..23bcd382b 100644
--- a/scripts/cluster/create_multinode_cluster.go
+++ b/scripts/cluster/create_multinode_cluster.go
@@ -41,10 +41,6 @@ func CreateMultinodeCluster(stockContainerd string, rawHaReplicaCount string) er
 		return err
 	}
 
-	/*if err := CreateMasterKubeletService(); err != nil {
-		return err
-	}*/
-
 	if err := DeployKubernetes(haReplicaCount); err != nil {
 		return err
 	}
@@ -77,29 +73,6 @@ func CreateMultinodeCluster(stockContainerd string, rawHaReplicaCount string) er
 	return nil
 }
 
-// Create kubelet service on master node
-func CreateMasterKubeletService() error {
-	utils.WaitPrintf("Creating kubelet service")
-	// Create service directory if not exist
-	_, err := utils.ExecShellCmd("sudo mkdir -p /etc/sysconfig")
-	if !utils.CheckErrorWithMsg(err, "Failed to create kubelet service!\n") {
-		return err
-	}
-	bashCmd := `sudo sh -c 'cat <<EOF > /etc/sysconfig/kubelet
-KUBELET_EXTRA_ARGS="--container-runtime=remote --v=%d --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
-EOF'`
-	_, err = utils.ExecShellCmd(bashCmd, configs.System.LogVerbosity)
-	if !utils.CheckErrorWithMsg(err, "Failed to create kubelet service!\n") {
-		return err
-	}
-	_, err = utils.ExecShellCmd("sudo systemctl daemon-reload")
-	if !utils.CheckErrorWithTagAndMsg(err, "Failed to create kubelet service!\n") {
-		return err
-	}
-
-	return nil
-}
-
 // Deploy Kubernetes
 func DeployKubernetes(haReplicaCount int) error {
 	utils.WaitPrintf("Deploying Kubernetes(version %s)", configs.Kube.K8sVersion)
diff --git a/scripts/setup.go b/scripts/setup.go
index f32cb58d7..bfa4e8f90 100644
--- a/scripts/setup.go
+++ b/scripts/setup.go
@@ -181,6 +181,7 @@ func main() {
 		// Original scripts from `scripts/cloudlab` directory
 	case "setup_node":
 		if setupFlags.NArg() < 3 {
+			// ha_mode - REGULAR (do not install load balancers), MASTER, BACKUP (with load balancers)
 			utils.FatalPrintf("Missing parameters: %s <ha_mode> <sandbox> [use-stargz]\n", subCmd)
 			utils.CleanEnvironment()
 			os.Exit(1)
diff --git a/scripts/utils/system.go b/scripts/utils/system.go
index ec81ed75a..2a8e09f82 100644
--- a/scripts/utils/system.go
+++ b/scripts/utils/system.go
@@ -253,7 +253,7 @@ func PrepareEnvironment() error {
 func CleanEnvironment() error {
 	// Define task List
 	cleanTaskList := []func() error{
-		//CleanUpTmpDir,
+		CleanUpTmpDir,
 	}
 	// Execute task
 	for _, task := range cleanTaskList {