diff --git a/.github/workflows/build-and-validate.yml b/.github/workflows/build-and-validate.yml
index f610f33fbb..2f7d6aa630 100644
--- a/.github/workflows/build-and-validate.yml
+++ b/.github/workflows/build-and-validate.yml
@@ -154,11 +154,9 @@ jobs:
           rm -rf dist/escu/lookups
           #rm -rf dist/saaws/lookups
           mkdir dist/escu/lookups
-          #mkdir dist/saaws/lookups
           #copy over lookups
           cd lookups
           cp -rv *.csv ../dist/escu/lookups
-          #cp -rv *.csv ../dist/saaws/lookups
 
       #Tag is '' for non-tagged push and the tag name for a tagged release
       - name: Set tag
@@ -191,13 +189,6 @@ jobs:
             sed -i "s/version = .*$/version = $CONTENT_VERSION/g" dist/escu/default/content-version.conf
             tar -czf content-pack-build-escu.tar.gz dist/escu/*
 
-            # update build number and version for saaws
-            #sed -i "s/build = .*$/build = ${{ github.run_number }}/g" dist/saaws/default/app.conf
-            #sed -i "s/^version = .*$/version = $CONTENT_VERSION/g" dist/saaws/default/app.conf
-            #sed -i "s/\"version\": .*$/\"version\": \"$CONTENT_VERSION\"/g" dist/saaws/app.manifest
-            #sed -i "s/version = .*$/version = $CONTENT_VERSION/g" dist/saaws/default/content-version.conf
-            #tar -czf content-pack-build-saaws.tar.gz dist/saaws/*
-
             # update build number and version for ssa
             tar -czf content-pack-build-ssa.tar.gz dist/ssa/*
 
@@ -207,7 +198,6 @@ jobs:
           name: content-pack-build
           path: |
             content-pack-build-escu.tar.gz
-            #content-pack-build-saaws.tar.gz
             content-pack-build-ssa.tar.gz
 
 
@@ -259,15 +249,10 @@ jobs:
           mv dist/ssa       SSA_Content
 
           slim package -o upload DA-ESS-ContentUpdate
-          #slim package -o upload DA-ESS_AmazonWebServices_Content
-          #slim package -o upload SSA_Content
 
           cp upload/DA-ESS-ContentUpdate-*.tar.gz DA-ESS-ContentUpdate-latest.tar.gz
           sha256sum DA-ESS-ContentUpdate-latest.tar.gz > checksum.txt
 
-          #cp upload/DA-ESS_AmazonWebServices_Content-*tar.gz DA-ESS_AmazonWebServices_Content-latest.tar.gz
-          #sha256sum DA-ESS_AmazonWebServices_Content-latest.tar.gz >> checksum.txt
-
           #Do this copy so that we conform as much as possible, and have to make 
           #as few changes as possible, once we start generating this as a real,
           #properly packaged app
@@ -289,7 +274,6 @@ jobs:
           name: content-latest
           path: |
             build/DA-ESS-ContentUpdate-latest.tar.gz
-            #build/DA-ESS_AmazonWebServices_Content-latest.tar.gz
             build/SSA_Content-latest.tar.gz
             build/checksum.txt
 
@@ -338,7 +322,6 @@ jobs:
           #Enclose in quotes in case there are any special characters in the username/password
           #Better not to pass these arguments on the command line, if possible
           ./appinspect.sh ../ DA-ESS-ContentUpdate-latest.tar.gz "$APPINSPECT_USERNAME" "$APPINSPECT_PASSWORD"
-          #./appinspect.sh ../ DA-ESS_AmazonWebServices_Content-latest.tar.gz "$APPINSPECT_USERNAME" "$APPINSPECT_PASSWORD"
 
       - name: Create report artifact
         if: always()
@@ -438,8 +421,6 @@ jobs:
         run: |
           mkdir latest-escu
           tar -zxf DA-ESS-ContentUpdate-latest.tar.gz -C latest-escu --strip-components=1
-          #mkdir latest-saaws
-          #tar -zxf DA-ESS_AmazonWebServices_Content-latest.tar.gz -C latest-saaws --strip-components=1
           mkdir latest-ssa
           tar -zxf SSA_Content-latest.tar.gz -C latest-ssa --strip-components=1
       - name: Install Python Dependencies
@@ -483,7 +464,6 @@ jobs:
           rm -rf dist
           mkdir dist
           mv latest-escu dist/escu
-          #mv latest-saaws dist/saaws
           mv latest-ssa dist/ssa
           # configure git to prep for commit
           git config user.email "research@splunk.com"
@@ -526,7 +506,6 @@ jobs:
       - name: Rename the content-update appropriately
         run: |
           cp DA-ESS-ContentUpdate-latest.tar.gz DA-ESS-ContentUpdate-${{ steps.vars.outputs.tag }}.tar.gz
-          #cp DA-ESS_AmazonWebServices_Content-latest.tar.gz DA-ESS_AmazonWebServices_Content-${{ steps.vars.outputs.tag }}.tar.gz
           cp SSA_Content-latest.tar.gz SSA_Content-${{ steps.vars.outputs.tag }}.tar.gz
 
           #No checksum on the reports
@@ -541,7 +520,6 @@ jobs:
         with:
           files: |
             DA-ESS-ContentUpdate-${{ steps.vars.outputs.tag }}.tar.gz
-            #DA-ESS_AmazonWebServices_Content-${{ steps.vars.outputs.tag }}.tar.gz
             SSA_Content-${{ steps.vars.outputs.tag }}.tar.gz
             report-${{ steps.vars.outputs.tag }}.tar.gz
             checksum-${{ steps.vars.outputs.tag }}.txt