diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh
index f93fc7c152d..97b3a3a4904 100755
--- a/.buildkite/scripts/common.sh
+++ b/.buildkite/scripts/common.sh
@@ -82,14 +82,6 @@ go(){
     return $ACTUAL_EXIT_CODE
 }
 
-google_cloud_auth() {
-    local keyFile=$1
-
-    gcloud auth activate-service-account --key-file ${keyFile} 2> /dev/null
-
-    export GOOGLE_APPLICATION_CREDENTIALS=${secretFileLocation}
-}
-
 retry() {
     local retries=$1
     shift
diff --git a/.buildkite/scripts/common2.sh b/.buildkite/scripts/common2.sh
deleted file mode 100755
index aed20eb7a8e..00000000000
--- a/.buildkite/scripts/common2.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-if [[ -z "${WORKSPACE-""}" ]]; then
-    WORKSPACE=$(git rev-parse --show-toplevel)
-    export WORKSPACE
-fi
-
-BEAT_VERSION=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+(\-[a-zA-Z]+[0-9]+)?' "${WORKSPACE}/version/version.go")
-export BEAT_VERSION
-
-getOSOptions() {
-  case $(uname | tr '[:upper:]' '[:lower:]') in
-    linux*)
-      export AGENT_OS_NAME=linux
-      ;;
-    darwin*)
-      export AGENT_OS_NAME=darwin
-      ;;
-    msys*)
-      export AGENT_OS_NAME=windows
-      ;;
-    *)
-      export AGENT_OS_NAME=notset
-      ;;
-  esac
-  case $(uname -m | tr '[:upper:]' '[:lower:]') in
-    aarch64*)
-      export AGENT_OS_ARCH=arm64
-      ;;
-    arm64*)
-      export AGENT_OS_ARCH=arm64
-      ;;
-    amd64*)
-      export AGENT_OS_ARCH=amd64
-      ;;
-    x86_64*)
-      export AGENT_OS_ARCH=amd64
-      ;;
-    *)
-      export AGENT_OS_ARCH=notset
-      ;;
-  esac
-}
-
-google_cloud_auth() {
-    local keyFile=$1
-
-    gcloud auth activate-service-account --key-file ${keyFile} 2> /dev/null
-
-    export GOOGLE_APPLICATION_CREDENTIALS=${secretFileLocation}
-}
diff --git a/.buildkite/scripts/steps/ess_down.sh b/.buildkite/scripts/steps/ess_down.sh
index cbcbf06776b..2de58a0c382 100755
--- a/.buildkite/scripts/steps/ess_down.sh
+++ b/.buildkite/scripts/steps/ess_down.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-source .buildkite/scripts/common2.sh
-
 source .buildkite/scripts/steps/ess.sh
 
 ess_down || echo "Failed to stop ESS stack" >&2
diff --git a/.buildkite/scripts/steps/ess_start.sh b/.buildkite/scripts/steps/ess_start.sh
index 0e9d67c96d9..e44eb24ada0 100755
--- a/.buildkite/scripts/steps/ess_start.sh
+++ b/.buildkite/scripts/steps/ess_start.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-source .buildkite/scripts/common2.sh
 source .buildkite/scripts/steps/ess.sh
 source .buildkite/scripts/steps/fleet.sh
 
diff --git a/.buildkite/scripts/steps/integration_tests_tf.sh b/.buildkite/scripts/steps/integration_tests_tf.sh
index 2bf225e4ac2..89728748141 100755
--- a/.buildkite/scripts/steps/integration_tests_tf.sh
+++ b/.buildkite/scripts/steps/integration_tests_tf.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-source .buildkite/scripts/common2.sh
-
 source .buildkite/scripts/steps/ess.sh
 source .buildkite/scripts/steps/fleet.sh