diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh
index ad63bed129..d7993ad92f 100644
--- a/scripts/cleanup.sh
+++ b/scripts/cleanup.sh
@@ -13,9 +13,6 @@ docker ps -a -q | xargs -l -r docker rm
 pip install awscli
 printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure
 
-S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}"
-S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2"
-
 aws s3 ls | awk '{print $3}' | grep "^${S3_BUCKET_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force
 aws s3 ls | awk '{print $3}' | grep "^${S3_BUCKET2_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force
 
diff --git a/scripts/start-compose.sh b/scripts/start-compose.sh
index c852466f04..a3b47dcb2e 100755
--- a/scripts/start-compose.sh
+++ b/scripts/start-compose.sh
@@ -7,10 +7,6 @@ if [ -z "$DOCKER_COMPOSE_PATH" ] ; then
   exit 1
 fi
 
-# Fix uppercase bucket name if set
-#export S3_BUCKET_NAME="${S3_BUCKET_NAME,,}"
-#export S3_BUCKET2_NAME="${S3_BUCKET2_NAME,,}"
-
 echo "Starting AGS stack in ${DOCKER_COMPOSE_PATH}"
 
 # .env files are picked up from project directory correctly on docker-compose 1.23.0+