diff --git a/qa/scripts/runSamsungGauntlet.sh b/qa/scripts/runSamsungGauntlet.sh
index 086bf0874..37cc0a930 100644
--- a/qa/scripts/runSamsungGauntlet.sh
+++ b/qa/scripts/runSamsungGauntlet.sh
@@ -2,9 +2,6 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-# requires TF_VAR_gitlab_token env var to be set
-if [ -z ${TF_VAR_gitlab_token+x} ]; then echo "TF_VAR_gitlab_token is unset"; else echo "TF_VAR_gitlab_token is set to '$TF_VAR_gitlab_token'"; fi
-
 # requires TF_VAR_branch env var to be set
 if [ -z ${TF_VAR_branch+x} ]; then echo "TF_VAR_branch is unset"; else echo "TF_VAR_branch is set to '$TF_VAR_branch'"; fi
 
diff --git a/qa/scripts/runSmokeTest.sh b/qa/scripts/runSmokeTest.sh
index 96866fd6d..6b598995e 100755
--- a/qa/scripts/runSmokeTest.sh
+++ b/qa/scripts/runSmokeTest.sh
@@ -2,8 +2,6 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-# requires TF_VAR_gitlab_token env var to be set
-if [ -z ${TF_VAR_gitlab_token+x} ]; then echo "TF_VAR_gitlab_token is unset"; else echo "TF_VAR_gitlab_token is set to '$TF_VAR_gitlab_token'"; fi
 
 # requires TF_VAR_branch env var to be set
 if [ -z ${TF_VAR_branch+x} ]; then echo "TF_VAR_branch is unset"; else echo "TF_VAR_branch is set to '$TF_VAR_branch'"; fi
diff --git a/qa/scripts/setupSamsungGauntlet.sh b/qa/scripts/setupSamsungGauntlet.sh
index 1229c0044..e7929ea9f 100755
--- a/qa/scripts/setupSamsungGauntlet.sh
+++ b/qa/scripts/setupSamsungGauntlet.sh
@@ -3,9 +3,6 @@
 # To run script: ./setupSamsungGauntlet.sh
 export TF_IN_AUTOMATION=1
 
-# requires TF_VAR_gitlab_token env var to be set
-if [ -z ${TF_VAR_gitlab_token+x} ]; then echo "TF_VAR_gitlab_token is unset"; else echo "TF_VAR_gitlab_token is set to '$TF_VAR_gitlab_token'"; fi
-
 # requires TF_VAR_branch env var to be set
 if [ -z ${TF_VAR_branch+x} ]; then echo "TF_VAR_branch is unset"; else echo "TF_VAR_branch is set to '$TF_VAR_branch'"; fi
 
diff --git a/qa/scripts/setupSmokeTest.sh b/qa/scripts/setupSmokeTest.sh
index fac0d7111..1059e5f29 100755
--- a/qa/scripts/setupSmokeTest.sh
+++ b/qa/scripts/setupSmokeTest.sh
@@ -3,9 +3,6 @@
 # To run script: ./setupSmokeTest.sh
 export TF_IN_AUTOMATION=1
 
-# requires TF_VAR_gitlab_token env var to be set
-if [ -z ${TF_VAR_gitlab_token+x} ]; then echo "TF_VAR_gitlab_token is unset"; else echo "TF_VAR_gitlab_token is set to '$TF_VAR_gitlab_token'"; fi
-
 # requires TF_VAR_branch env var to be set
 if [ -z ${TF_VAR_branch+x} ]; then echo "TF_VAR_branch is unset"; else echo "TF_VAR_branch is set to '$TF_VAR_branch'"; fi
 
diff --git a/qa/scripts/teardownSamsungGauntlet.sh b/qa/scripts/teardownSamsungGauntlet.sh
index ae614d99b..0e5598569 100755
--- a/qa/scripts/teardownSamsungGauntlet.sh
+++ b/qa/scripts/teardownSamsungGauntlet.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # To run script: ./teardownSamsungGauntlet.sh
-# requires TF_VAR_gitlab_token env var to be set
 
 cd qa/tf/gauntlet/samsung
 export TF_IN_AUTOMATION=1
diff --git a/qa/scripts/teardownSmokeTest.sh b/qa/scripts/teardownSmokeTest.sh
index 6215d419e..76eeb564b 100755
--- a/qa/scripts/teardownSmokeTest.sh
+++ b/qa/scripts/teardownSmokeTest.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 
 # To run script: ./teardownSmokeTest.sh
-# requires TF_VAR_gitlab_token env var to be set
-if [ -z ${TF_VAR_gitlab_token+x} ]; then echo "TF_VAR_gitlab_token is unset"; else echo "TF_VAR_gitlab_token is set to '$TF_VAR_gitlab_token'"; fi
 
 # requires TF_VAR_branch env var to be set
 if [ -z ${TF_VAR_branch+x} ]; then echo "TF_VAR_branch is unset"; else echo "TF_VAR_branch is set to '$TF_VAR_branch'"; fi
diff --git a/qa/scripts/testSmokeTest.sh b/qa/scripts/testSmokeTest.sh
index 31ef6f49d..b6ba34e7f 100755
--- a/qa/scripts/testSmokeTest.sh
+++ b/qa/scripts/testSmokeTest.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# requires TF_VAR_gitlab_token env var to be set
-if [ -z ${TF_VAR_gitlab_token+x} ]; then echo "TF_VAR_gitlab_token is unset"; else echo "TF_VAR_gitlab_token is set to '$TF_VAR_gitlab_token'"; fi
-
 # requires TF_VAR_branch env var to be set
 if [ -z ${TF_VAR_branch+x} ]; then echo "TF_VAR_branch is unset"; else echo "TF_VAR_branch is set to '$TF_VAR_branch'"; fi
 
diff --git a/qa/scripts/utilCluster.sh b/qa/scripts/utilCluster.sh
index 8d1717b92..629a63aeb 100644
--- a/qa/scripts/utilCluster.sh
+++ b/qa/scripts/utilCluster.sh
@@ -133,14 +133,6 @@ executeGeneralNodeConfigCommands() {
         exit 1
     fi
 
-    # TODO handle different archs
-#    echo "Getting featurebase binary (https://gitlab.com/api/v4/projects/molecula%2Ffeaturebase/jobs/artifacts/${TF_VAR_branch}/raw/featurebase_linux_arm64?job=build%20for%20linux%20arm64)..."
-#    ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no ec2-user@${NODEIP} "curl --fail --header 'PRIVATE-TOKEN: ${TF_VAR_gitlab_token}' -o /home/ec2-user/featurebase_linux_arm64 https://gitlab.com/api/v4/projects/molecula%2Ffeaturebase/jobs/artifacts/${TF_VAR_branch}/raw/featurebase_linux_arm64?job=build%20for%20linux%20arm64"
-#    if (( $? != 0 )) 
-#    then 
-#        echo "Unable to get featurebase binary"
-#        exit 1
-#    fi
     ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no ec2-user@${NODEIP} "chown ec2-user:ec2-user /home/ec2-user/featurebase_linux_arm64"
     ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no ec2-user@${NODEIP} "chmod ugo+x /home/ec2-user/featurebase_linux_arm64"
     ssh -A -i ~/.ssh/gitlab-featurebase-ci.pem -o StrictHostKeyChecking=no ec2-user@${NODEIP} "sudo mv /home/ec2-user/featurebase_linux_arm64 /usr/local/bin/featurebase"
diff --git a/qa/tf/ci/smoketest/variables.tf b/qa/tf/ci/smoketest/variables.tf
index bab877497..578305341 100644
--- a/qa/tf/ci/smoketest/variables.tf
+++ b/qa/tf/ci/smoketest/variables.tf
@@ -8,11 +8,6 @@ variable "profile" {
   type        = string
 }
 
-variable "gitlab_token" {
-  description = "The API token for taking to Gitlab API - expected to come from an env variable."
-  type        = string
-}
-
 variable "cluster_prefix" {
   type        = string
   description = "This is a identifier that will be prefixed to created resources"
diff --git a/qa/tf/gauntlet/samsung/variables.tf b/qa/tf/gauntlet/samsung/variables.tf
index bab877497..578305341 100644
--- a/qa/tf/gauntlet/samsung/variables.tf
+++ b/qa/tf/gauntlet/samsung/variables.tf
@@ -8,11 +8,6 @@ variable "profile" {
   type        = string
 }
 
-variable "gitlab_token" {
-  description = "The API token for taking to Gitlab API - expected to come from an env variable."
-  type        = string
-}
-
 variable "cluster_prefix" {
   type        = string
   description = "This is a identifier that will be prefixed to created resources"