diff --git a/src/content-render/stylesheets/syntax-highlighting.scss b/src/content-render/stylesheets/syntax-highlighting.scss
index 3f51b6d71b..4755209b54 100644
--- a/src/content-render/stylesheets/syntax-highlighting.scss
+++ b/src/content-render/stylesheets/syntax-highlighting.scss
@@ -17,6 +17,9 @@ from https://unpkg.com/highlight.js@9.15.8/styles/github.css
 }
 
 // Updating color for code comments from prettylights to codemirror due to accessibility issues: audit 4975
+// - variable fixed in 7.15.4
+// - https://github.com/primer/css/blob/main/package.json
+// TODO when above updates, upgrade the primer/css package and change this variable back
 .hljs-comment {
   color: var(--color-codemirror-syntax-comment);
 }
diff --git a/src/fixtures/fixtures/article-with-redirect-from-string.md b/src/fixtures/fixtures/article-with-redirect-from-string.md
index 79a3c7d9e3..36dcfa6278 100644
--- a/src/fixtures/fixtures/article-with-redirect-from-string.md
+++ b/src/fixtures/fixtures/article-with-redirect-from-string.md
@@ -3,7 +3,6 @@ title: Article with redirect_from string
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 redirect_from: /redirect-string
 ---
diff --git a/src/fixtures/fixtures/content/actions/category/index.md b/src/fixtures/fixtures/content/actions/category/index.md
index 869e2641a3..b03662c1dc 100644
--- a/src/fixtures/fixtures/content/actions/category/index.md
+++ b/src/fixtures/fixtures/content/actions/category/index.md
@@ -6,7 +6,6 @@ product: This is the callout text
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /map-topic
diff --git a/src/fixtures/fixtures/content/actions/category/map-topic/article.md b/src/fixtures/fixtures/content/actions/category/map-topic/article.md
index ed5dd26bb4..fa1d332f36 100644
--- a/src/fixtures/fixtures/content/actions/category/map-topic/article.md
+++ b/src/fixtures/fixtures/content/actions/category/map-topic/article.md
@@ -5,7 +5,6 @@ intro: 'This page uses < and > in the title and `shortTitle` to demonstrate that
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: tutorial
 ---
diff --git a/src/fixtures/fixtures/content/actions/category/map-topic/index.md b/src/fixtures/fixtures/content/actions/category/map-topic/index.md
index 9649a310cf..8b2bac282e 100644
--- a/src/fixtures/fixtures/content/actions/category/map-topic/index.md
+++ b/src/fixtures/fixtures/content/actions/category/map-topic/index.md
@@ -5,7 +5,6 @@ intro: "Here's the intro for {% data variables.product.prodname_actions %}."
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /article
diff --git a/src/fixtures/fixtures/content/actions/index.md b/src/fixtures/fixtures/content/actions/index.md
index 712261ee6b..7afa48729a 100644
--- a/src/fixtures/fixtures/content/actions/index.md
+++ b/src/fixtures/fixtures/content/actions/index.md
@@ -8,7 +8,6 @@ layout: product-landing
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /category
diff --git a/src/fixtures/fixtures/content/early-access/index.md b/src/fixtures/fixtures/content/early-access/index.md
index 9279a1d6a7..5549ea6e68 100644
--- a/src/fixtures/fixtures/content/early-access/index.md
+++ b/src/fixtures/fixtures/content/early-access/index.md
@@ -4,7 +4,6 @@ hidden: true
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /secrets
diff --git a/src/fixtures/fixtures/content/early-access/secrets/deeper/index.md b/src/fixtures/fixtures/content/early-access/secrets/deeper/index.md
index 9f804e9159..870226ec8e 100644
--- a/src/fixtures/fixtures/content/early-access/secrets/deeper/index.md
+++ b/src/fixtures/fixtures/content/early-access/secrets/deeper/index.md
@@ -3,7 +3,6 @@ title: Deeper secrets
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 hidden: true
 children:
diff --git a/src/fixtures/fixtures/content/early-access/secrets/deeper/mariana-trench.md b/src/fixtures/fixtures/content/early-access/secrets/deeper/mariana-trench.md
index 9d07fc1aff..d971f8a4ff 100644
--- a/src/fixtures/fixtures/content/early-access/secrets/deeper/mariana-trench.md
+++ b/src/fixtures/fixtures/content/early-access/secrets/deeper/mariana-trench.md
@@ -3,7 +3,6 @@ title: Mariana Trench
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 hidden: true
 ---
diff --git a/src/fixtures/fixtures/content/early-access/secrets/index.md b/src/fixtures/fixtures/content/early-access/secrets/index.md
index c95a719683..8b4bada36a 100644
--- a/src/fixtures/fixtures/content/early-access/secrets/index.md
+++ b/src/fixtures/fixtures/content/early-access/secrets/index.md
@@ -3,7 +3,6 @@ title: GitHub Secrets
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 hidden: true
 children:
diff --git a/src/fixtures/fixtures/content/get-started/foo/anchor-autotitling.md b/src/fixtures/fixtures/content/get-started/foo/anchor-autotitling.md
index 6ed5b750dd..53e4f4008a 100644
--- a/src/fixtures/fixtures/content/get-started/foo/anchor-autotitling.md
+++ b/src/fixtures/fixtures/content/get-started/foo/anchor-autotitling.md
@@ -4,7 +4,6 @@ intro: If the author use an anchor link for AUTOTITLE it should fail
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
 type: how_to
 ---
 
diff --git a/src/fixtures/fixtures/content/get-started/foo/autotitling.md b/src/fixtures/fixtures/content/get-started/foo/autotitling.md
index 5caaa6afc8..96d843604f 100644
--- a/src/fixtures/fixtures/content/get-started/foo/autotitling.md
+++ b/src/fixtures/fixtures/content/get-started/foo/autotitling.md
@@ -4,7 +4,6 @@ intro: Internal links that use AUTOTITLE should just work
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/foo/bar.md b/src/fixtures/fixtures/content/get-started/foo/bar.md
index 69083b20ca..0db6cc0c61 100644
--- a/src/fixtures/fixtures/content/get-started/foo/bar.md
+++ b/src/fixtures/fixtures/content/get-started/foo/bar.md
@@ -5,7 +5,6 @@ intro: This page doesn't really have an intro
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 ---
 
diff --git a/src/fixtures/fixtures/content/get-started/foo/cross-version-linking.md b/src/fixtures/fixtures/content/get-started/foo/cross-version-linking.md
index f239634fb0..64ffe0a800 100644
--- a/src/fixtures/fixtures/content/get-started/foo/cross-version-linking.md
+++ b/src/fixtures/fixtures/content/get-started/foo/cross-version-linking.md
@@ -4,7 +4,6 @@ intro: Testing to cross the version boundary with hardcoded cross-version links
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/foo/for-playwright.md b/src/fixtures/fixtures/content/get-started/foo/for-playwright.md
index 626afb6527..0b71689d67 100644
--- a/src/fixtures/fixtures/content/get-started/foo/for-playwright.md
+++ b/src/fixtures/fixtures/content/get-started/foo/for-playwright.md
@@ -4,7 +4,6 @@ intro: Exists for a Playwright test
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 ---
 
diff --git a/src/fixtures/fixtures/content/get-started/foo/html-short-title.md b/src/fixtures/fixtures/content/get-started/foo/html-short-title.md
index fc7d5ac0d2..6d728ed61d 100644
--- a/src/fixtures/fixtures/content/get-started/foo/html-short-title.md
+++ b/src/fixtures/fixtures/content/get-started/foo/html-short-title.md
@@ -5,7 +5,6 @@ intro: Note that this page's `shortTitle` needs HTML escaping
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 ---
 
diff --git a/src/fixtures/fixtures/content/get-started/foo/index.md b/src/fixtures/fixtures/content/get-started/foo/index.md
index 6dd089b249..ddf783e674 100644
--- a/src/fixtures/fixtures/content/get-started/foo/index.md
+++ b/src/fixtures/fixtures/content/get-started/foo/index.md
@@ -5,7 +5,6 @@ intro: 'The most basic of fixture data for {% data variables.product.product_nam
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /bar
diff --git a/src/fixtures/fixtures/content/get-started/foo/page-with-callout.md b/src/fixtures/fixtures/content/get-started/foo/page-with-callout.md
index dac8c0186e..17c47c4875 100644
--- a/src/fixtures/fixtures/content/get-started/foo/page-with-callout.md
+++ b/src/fixtures/fixtures/content/get-started/foo/page-with-callout.md
@@ -6,7 +6,6 @@ product: '{% data reusables.gated-features.not-for-ghes %}'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 ---
 
diff --git a/src/fixtures/fixtures/content/get-started/foo/typo-autotitling.md b/src/fixtures/fixtures/content/get-started/foo/typo-autotitling.md
index 58828f978b..277201126d 100644
--- a/src/fixtures/fixtures/content/get-started/foo/typo-autotitling.md
+++ b/src/fixtures/fixtures/content/get-started/foo/typo-autotitling.md
@@ -4,7 +4,6 @@ intro: If the author typos the word "AUTOTITLE" it will throw
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
 type: how_to
 ---
 
diff --git a/src/fixtures/fixtures/content/get-started/images/images-in-lists.md b/src/fixtures/fixtures/content/get-started/images/images-in-lists.md
index 7572c78f63..a0b7313a51 100644
--- a/src/fixtures/fixtures/content/get-started/images/images-in-lists.md
+++ b/src/fixtures/fixtures/content/get-started/images/images-in-lists.md
@@ -4,7 +4,6 @@ intro: Images within procedural steps
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
@@ -14,4 +13,4 @@ type: how_to
 1. Cold brew is great.
 1. French press is also great
   ![test image](/assets/images/_fixtures/electrocat.png)
-3. Drip coffee is not so great. 
\ No newline at end of file
+3. Drip coffee is not so great.
diff --git a/src/fixtures/fixtures/content/get-started/images/index.md b/src/fixtures/fixtures/content/get-started/images/index.md
index 0aba6db4d4..fb581a2dc6 100644
--- a/src/fixtures/fixtures/content/get-started/images/index.md
+++ b/src/fixtures/fixtures/content/get-started/images/index.md
@@ -4,7 +4,6 @@ intro: Testing various image functionality
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /single-image
diff --git a/src/fixtures/fixtures/content/get-started/images/link-to-image.md b/src/fixtures/fixtures/content/get-started/images/link-to-image.md
index 8c7ce1fb8a..657718dfdc 100644
--- a/src/fixtures/fixtures/content/get-started/images/link-to-image.md
+++ b/src/fixtures/fixtures/content/get-started/images/link-to-image.md
@@ -4,7 +4,6 @@ intro: You can link directly to an asset
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/images/single-image.md b/src/fixtures/fixtures/content/get-started/images/single-image.md
index e8676a8430..0d8c90cb56 100644
--- a/src/fixtures/fixtures/content/get-started/images/single-image.md
+++ b/src/fixtures/fixtures/content/get-started/images/single-image.md
@@ -4,7 +4,6 @@ intro: A simple page that has 1 asset image
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/index.md b/src/fixtures/fixtures/content/get-started/index.md
index 4509ff350a..7f4b0d613a 100644
--- a/src/fixtures/fixtures/content/get-started/index.md
+++ b/src/fixtures/fixtures/content/get-started/index.md
@@ -5,7 +5,6 @@ intro: 'This is the intro'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 layout: product-landing
 introLinks:
diff --git a/src/fixtures/fixtures/content/get-started/learning-about-github/index.md b/src/fixtures/fixtures/content/get-started/learning-about-github/index.md
index ae737de80b..918b74759d 100644
--- a/src/fixtures/fixtures/content/get-started/learning-about-github/index.md
+++ b/src/fixtures/fixtures/content/get-started/learning-about-github/index.md
@@ -4,7 +4,6 @@ intro: 'Learn how you can use {% data variables.product.company_short %} product
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /github-glossary
diff --git a/src/fixtures/fixtures/content/get-started/liquid/danger.md b/src/fixtures/fixtures/content/get-started/liquid/danger.md
index eca6816154..7a7c6cbefe 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/danger.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/danger.md
@@ -4,7 +4,6 @@ intro: Demonstrates the HTML that becomes of a `danger` Liquid tag
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/liquid/data.md b/src/fixtures/fixtures/content/get-started/liquid/data.md
index 277e7c2e19..c343338be1 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/data.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/data.md
@@ -4,7 +4,6 @@ intro: The `data` Liquid tag can understand where it was used
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/liquid/ifversion.md b/src/fixtures/fixtures/content/get-started/liquid/ifversion.md
index 95bf373ba6..f7eace4b03 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/ifversion.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/ifversion.md
@@ -4,7 +4,6 @@ intro: 'Tests functionality of `ifversion` and its operators {% ifversion not fp
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/liquid/index.md b/src/fixtures/fixtures/content/get-started/liquid/index.md
index 4c90a2704b..ab84f4b632 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/index.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/index.md
@@ -4,7 +4,6 @@ intro: Testing various fancy Liquid rendering functionality
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /warnings
diff --git a/src/fixtures/fixtures/content/get-started/liquid/links-with-liquid.md b/src/fixtures/fixtures/content/get-started/liquid/links-with-liquid.md
index 26fe0ebbc4..6f8eea0d4c 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/links-with-liquid.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/links-with-liquid.md
@@ -4,7 +4,6 @@ intro: When Liquid is used to generate a Markdown link
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/liquid/notes.md b/src/fixtures/fixtures/content/get-started/liquid/notes.md
index 0ea05a5f3e..16772f914f 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/notes.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/notes.md
@@ -4,7 +4,6 @@ intro: Demonstrates the HTML that becomes of a `note` Liquid tag
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/liquid/platform-specific.md b/src/fixtures/fixtures/content/get-started/liquid/platform-specific.md
index a1dedcb257..b470e7064b 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/platform-specific.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/platform-specific.md
@@ -4,7 +4,6 @@ intro: Demonstrates the HTML that becomes of a `mac`, `windows`, and `linux` Liq
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 defaultPlatform: windows
diff --git a/src/fixtures/fixtures/content/get-started/liquid/raw.md b/src/fixtures/fixtures/content/get-started/liquid/raw.md
index 45fa0b2668..0d1ea2c61c 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/raw.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/raw.md
@@ -4,7 +4,6 @@ intro: Demonstrates the use of {% raw %}{% raw %}{% endraw %}
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/liquid/table-row-headers.md b/src/fixtures/fixtures/content/get-started/liquid/table-row-headers.md
index 49226381b0..54f22997da 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/table-row-headers.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/table-row-headers.md
@@ -4,7 +4,6 @@ intro: A table with a Liquid tag that turns the first column into `<th>` cells
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/liquid/tips.md b/src/fixtures/fixtures/content/get-started/liquid/tips.md
index 5dde964416..544703f7d0 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/tips.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/tips.md
@@ -4,7 +4,6 @@ intro: Demonstrates the HTML that becomes of a `tip` Liquid tag
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/liquid/tool-platform-switcher.md b/src/fixtures/fixtures/content/get-started/liquid/tool-platform-switcher.md
index 81b11eb2f5..4d88b7cb69 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/tool-platform-switcher.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/tool-platform-switcher.md
@@ -6,7 +6,6 @@ defaultPlatform: mac
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: tutorial
 ---
diff --git a/src/fixtures/fixtures/content/get-started/liquid/tool-specific.md b/src/fixtures/fixtures/content/get-started/liquid/tool-specific.md
index 9836edc655..d74d147876 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/tool-specific.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/tool-specific.md
@@ -1,11 +1,10 @@
 ---
-title: Tool switching Liquid tags 
+title: Tool switching Liquid tags
 intro: Demonstrates the HTML that becomes of a the different tool Liquid tags like `webui`, `cli`, and `codespaces`
 defaultTool: desktop
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: tutorial
 ---
diff --git a/src/fixtures/fixtures/content/get-started/liquid/warnings.md b/src/fixtures/fixtures/content/get-started/liquid/warnings.md
index 441932579c..bd6ac148e8 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/warnings.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/warnings.md
@@ -4,7 +4,6 @@ intro: Demonstrates the HTML that becomes of a `warning` Liquid tag
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/liquid/whitespace.md b/src/fixtures/fixtures/content/get-started/liquid/whitespace.md
index 05e7af77c5..47482c3c10 100644
--- a/src/fixtures/fixtures/content/get-started/liquid/whitespace.md
+++ b/src/fixtures/fixtures/content/get-started/liquid/whitespace.md
@@ -4,7 +4,6 @@ intro: Demonstrates use of `-` in Liquid tags
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/markdown/code-annotations.md b/src/fixtures/fixtures/content/get-started/markdown/code-annotations.md
index bb8b43b2cf..4b211112bc 100644
--- a/src/fixtures/fixtures/content/get-started/markdown/code-annotations.md
+++ b/src/fixtures/fixtures/content/get-started/markdown/code-annotations.md
@@ -4,7 +4,6 @@ intro: This page has code annotations
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 layout: inline
diff --git a/src/fixtures/fixtures/content/get-started/markdown/index.md b/src/fixtures/fixtures/content/get-started/markdown/index.md
index 6acdd6d617..e2ebf40267 100644
--- a/src/fixtures/fixtures/content/get-started/markdown/index.md
+++ b/src/fixtures/fixtures/content/get-started/markdown/index.md
@@ -4,7 +4,6 @@ intro: Testing various Markdown rendering functionality
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /intro
diff --git a/src/fixtures/fixtures/content/get-started/markdown/intro.md b/src/fixtures/fixtures/content/get-started/markdown/intro.md
index 0c934f30ef..a232fd6924 100644
--- a/src/fixtures/fixtures/content/get-started/markdown/intro.md
+++ b/src/fixtures/fixtures/content/get-started/markdown/intro.md
@@ -4,7 +4,6 @@ intro: This intro has **Markdown** `syntax` for *{% data variables.product.produ
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/markdown/permissions.md b/src/fixtures/fixtures/content/get-started/markdown/permissions.md
index c113ea22d4..94728c3e1d 100644
--- a/src/fixtures/fixtures/content/get-started/markdown/permissions.md
+++ b/src/fixtures/fixtures/content/get-started/markdown/permissions.md
@@ -5,7 +5,6 @@ permissions: 'People with **admin** can configure a {% data variables.product.pr
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
diff --git a/src/fixtures/fixtures/content/get-started/minitocs/index.md b/src/fixtures/fixtures/content/get-started/minitocs/index.md
index 75e1040757..f4832b1ad2 100644
--- a/src/fixtures/fixtures/content/get-started/minitocs/index.md
+++ b/src/fixtures/fixtures/content/get-started/minitocs/index.md
@@ -4,7 +4,6 @@ intro: 'Fixtures for testing the mini TOCs'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /no-heading
diff --git a/src/fixtures/fixtures/content/get-started/minitocs/markup-heading.md b/src/fixtures/fixtures/content/get-started/minitocs/markup-heading.md
index 7b39117aa8..e261628a12 100644
--- a/src/fixtures/fixtures/content/get-started/minitocs/markup-heading.md
+++ b/src/fixtures/fixtures/content/get-started/minitocs/markup-heading.md
@@ -4,7 +4,6 @@ intro: Fixture for testing Mini TOCs with markup in the heading
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
@@ -18,4 +17,4 @@ Some content
 
 ## Subheading 2
 
-More content
\ No newline at end of file
+More content
diff --git a/src/fixtures/fixtures/content/get-started/minitocs/multiple-headings.md b/src/fixtures/fixtures/content/get-started/minitocs/multiple-headings.md
index 9ebbcbbf32..1b62357e38 100644
--- a/src/fixtures/fixtures/content/get-started/minitocs/multiple-headings.md
+++ b/src/fixtures/fixtures/content/get-started/minitocs/multiple-headings.md
@@ -4,7 +4,6 @@ intro: Fixture for testing Mini TOCs with multiple headings
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
@@ -18,4 +17,4 @@ Some content
 
 ## Subheading 2
 
-More content
\ No newline at end of file
+More content
diff --git a/src/fixtures/fixtures/content/get-started/minitocs/no-heading.md b/src/fixtures/fixtures/content/get-started/minitocs/no-heading.md
index 40080583f5..a506445e93 100644
--- a/src/fixtures/fixtures/content/get-started/minitocs/no-heading.md
+++ b/src/fixtures/fixtures/content/get-started/minitocs/no-heading.md
@@ -4,10 +4,8 @@ intro: Fixture for testing mini TOCs with no headings
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
 
 Here is some content with no heading.
-
diff --git a/src/fixtures/fixtures/content/get-started/minitocs/one-heading.md b/src/fixtures/fixtures/content/get-started/minitocs/one-heading.md
index 325d85069b..bde6e1d068 100644
--- a/src/fixtures/fixtures/content/get-started/minitocs/one-heading.md
+++ b/src/fixtures/fixtures/content/get-started/minitocs/one-heading.md
@@ -4,11 +4,9 @@ intro: Fixture for testing mini TOCs with one heading
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: how_to
 ---
 
 ## Single heading
 Here is some content with a single heading.
-
diff --git a/src/fixtures/fixtures/content/get-started/start-your-journey/dynamic-title.md b/src/fixtures/fixtures/content/get-started/start-your-journey/dynamic-title.md
index a68de8def8..98712ed200 100644
--- a/src/fixtures/fixtures/content/get-started/start-your-journey/dynamic-title.md
+++ b/src/fixtures/fixtures/content/get-started/start-your-journey/dynamic-title.md
@@ -3,7 +3,6 @@ title: '{% ifversion fpt %}Hello{% else %}Greetings{% endif %} {% data variables
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: quick_start
 ---
diff --git a/src/fixtures/fixtures/content/get-started/start-your-journey/hello-world.md b/src/fixtures/fixtures/content/get-started/start-your-journey/hello-world.md
index 52a97ea07f..1794c34459 100644
--- a/src/fixtures/fixtures/content/get-started/start-your-journey/hello-world.md
+++ b/src/fixtures/fixtures/content/get-started/start-your-journey/hello-world.md
@@ -4,7 +4,6 @@ intro: 'Follow this Hello World exercise to get started with {% data variables.p
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: quick_start
 topics:
diff --git a/src/fixtures/fixtures/content/get-started/start-your-journey/index.md b/src/fixtures/fixtures/content/get-started/start-your-journey/index.md
index b7248e1ea1..41350b034a 100644
--- a/src/fixtures/fixtures/content/get-started/start-your-journey/index.md
+++ b/src/fixtures/fixtures/content/get-started/start-your-journey/index.md
@@ -4,7 +4,6 @@ intro: 'Get started using {% data variables.product.product_name %} to manage Gi
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /hello-world
diff --git a/src/fixtures/fixtures/content/get-started/start-your-journey/link-rewriting.md b/src/fixtures/fixtures/content/get-started/start-your-journey/link-rewriting.md
index 927b9fbb77..1e9bfb9722 100644
--- a/src/fixtures/fixtures/content/get-started/start-your-journey/link-rewriting.md
+++ b/src/fixtures/fixtures/content/get-started/start-your-journey/link-rewriting.md
@@ -4,7 +4,6 @@ intro: 'When rendered, links are rewriting to perfection for viewing'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: quick_start
 ---
diff --git a/src/fixtures/fixtures/content/get-started/video-transcripts/index.md b/src/fixtures/fixtures/content/get-started/video-transcripts/index.md
index 9813e3e0d2..ca560d1422 100644
--- a/src/fixtures/fixtures/content/get-started/video-transcripts/index.md
+++ b/src/fixtures/fixtures/content/get-started/video-transcripts/index.md
@@ -4,8 +4,7 @@ hidden: true
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /transcript--my-awesome-video
----
\ No newline at end of file
+---
diff --git a/src/fixtures/fixtures/content/get-started/video-transcripts/transcript--my-awesome-video.md b/src/fixtures/fixtures/content/get-started/video-transcripts/transcript--my-awesome-video.md
index 33fdfb59a8..b48cc73c35 100644
--- a/src/fixtures/fixtures/content/get-started/video-transcripts/transcript--my-awesome-video.md
+++ b/src/fixtures/fixtures/content/get-started/video-transcripts/transcript--my-awesome-video.md
@@ -4,8 +4,7 @@ product_video: 'https://www.yourube.com/abc123'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 ---
 
-This is a transcript
\ No newline at end of file
+This is a transcript
diff --git a/src/fixtures/fixtures/content/index.md b/src/fixtures/fixtures/content/index.md
index 62262435dc..4e9890c3f6 100644
--- a/src/fixtures/fixtures/content/index.md
+++ b/src/fixtures/fixtures/content/index.md
@@ -15,8 +15,8 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
+  ghae: '*'
 children:
   # The list of children in the fixtures has to be the same names
   # as we use in the real content. It can have fewer but can't include
diff --git a/src/fixtures/fixtures/content/pages/index.md b/src/fixtures/fixtures/content/pages/index.md
index 9e6d441f25..ebdf8534c1 100644
--- a/src/fixtures/fixtures/content/pages/index.md
+++ b/src/fixtures/fixtures/content/pages/index.md
@@ -9,7 +9,6 @@ product: '{% data reusables.gated-features.pages %}'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Pages
diff --git a/src/fixtures/fixtures/content/pages/quickstart.md b/src/fixtures/fixtures/content/pages/quickstart.md
index 612906005c..9f281a4c83 100644
--- a/src/fixtures/fixtures/content/pages/quickstart.md
+++ b/src/fixtures/fixtures/content/pages/quickstart.md
@@ -5,7 +5,6 @@ allowTitleToDifferFromFilename: true
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: quick_start
 permissions: These are permissions details, for more pages info start at the beginning with this "[article intro link](#introduction)". Also here's [another link](/get-started/start-your-journey/hello-world).
diff --git a/src/fixtures/fixtures/content/rest/about-the-rest-api/comparing-githubs-rest-api-and-graphql-api.md b/src/fixtures/fixtures/content/rest/about-the-rest-api/comparing-githubs-rest-api-and-graphql-api.md
index c7af7b15be..5efb318379 100644
--- a/src/fixtures/fixtures/content/rest/about-the-rest-api/comparing-githubs-rest-api-and-graphql-api.md
+++ b/src/fixtures/fixtures/content/rest/about-the-rest-api/comparing-githubs-rest-api-and-graphql-api.md
@@ -4,7 +4,6 @@ intro: 'Gentle and fun intro about APIs'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 ---
 
diff --git a/src/fixtures/fixtures/content/rest/about-the-rest-api/index.md b/src/fixtures/fixtures/content/rest/about-the-rest-api/index.md
index 36340c4bbd..c1dc7a1dde 100644
--- a/src/fixtures/fixtures/content/rest/about-the-rest-api/index.md
+++ b/src/fixtures/fixtures/content/rest/about-the-rest-api/index.md
@@ -5,7 +5,6 @@ intro: 'Learn about resources, libraries, previews and troubleshooting for {% da
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /comparing-githubs-rest-api-and-graphql-api
diff --git a/src/fixtures/fixtures/content/rest/actions/artifacts.md b/src/fixtures/fixtures/content/rest/actions/artifacts.md
index 7038bd29ba..2e420c5daf 100644
--- a/src/fixtures/fixtures/content/rest/actions/artifacts.md
+++ b/src/fixtures/fixtures/content/rest/actions/artifacts.md
@@ -9,7 +9,6 @@ topics:
   - API
 versions:
   fpt: '*'
-  ghae: '*'
   ghec: '*'
   ghes: '*'
 autogenerated: rest
diff --git a/src/fixtures/fixtures/content/rest/actions/index.md b/src/fixtures/fixtures/content/rest/actions/index.md
index c3a10887e1..9d63b1b174 100644
--- a/src/fixtures/fixtures/content/rest/actions/index.md
+++ b/src/fixtures/fixtures/content/rest/actions/index.md
@@ -7,7 +7,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /artifacts
diff --git a/src/fixtures/fixtures/content/rest/index.md b/src/fixtures/fixtures/content/rest/index.md
index e591e8931b..a0f5c9ded9 100644
--- a/src/fixtures/fixtures/content/rest/index.md
+++ b/src/fixtures/fixtures/content/rest/index.md
@@ -15,7 +15,6 @@ layout: product-landing
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /about-the-rest-api
diff --git a/src/fixtures/fixtures/content/search/index.md b/src/fixtures/fixtures/content/search/index.md
index e3b3da45f7..5c4f33d4b0 100644
--- a/src/fixtures/fixtures/content/search/index.md
+++ b/src/fixtures/fixtures/content/search/index.md
@@ -5,6 +5,4 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 ---
-
diff --git a/src/fixtures/fixtures/data/variables/location.yml b/src/fixtures/fixtures/data/variables/location.yml
index 3995450ed5..c3fd284c23 100644
--- a/src/fixtures/fixtures/data/variables/location.yml
+++ b/src/fixtures/fixtures/data/variables/location.yml
@@ -1,6 +1,6 @@
 ## Use these variables when referring specifically to a location within a product
 product_location: >-
-  {% ifversion ghes %}your GitHub Enterprise Server instance{% elsif ghae %}your enterprise{% else %}GitHub.com{% endif %}
+  {% ifversion ghes %}your GitHub Enterprise Server instance{% else %}GitHub.com{% endif %}
 
 # Used ONLY when you need to refer to a GHES instance in an article that is versioned for non-GHES versions.
 # Do not use in other situations!
diff --git a/src/fixtures/fixtures/data/variables/product.yml b/src/fixtures/fixtures/data/variables/product.yml
index 4b517d665b..e576d38cd0 100644
--- a/src/fixtures/fixtures/data/variables/product.yml
+++ b/src/fixtures/fixtures/data/variables/product.yml
@@ -1,7 +1,7 @@
 company_short: 'HubGit'
 
 product_name: >-
-  {% ifversion ghec %}HubGit Enterprise Cloud{% elsif ghes %}HubGit Enterprise Server{% elsif ghae %}HubGit AE{% else %}HubGit{% endif %}
+  {% ifversion ghec %}HubGit Enterprise Cloud{% elsif ghes %}HubGit Enterprise Server{% else %}HubGit{% endif %}
 
 prodname_dotcom: 'HubGit'
 
diff --git a/src/fixtures/fixtures/liquid-tags/bad-data-variable.md b/src/fixtures/fixtures/liquid-tags/bad-data-variable.md
index 669c888d0c..9d8dfcedb7 100644
--- a/src/fixtures/fixtures/liquid-tags/bad-data-variable.md
+++ b/src/fixtures/fixtures/liquid-tags/bad-data-variable.md
@@ -3,7 +3,6 @@ title: Sample page
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 ---
 
diff --git a/src/fixtures/fixtures/liquid-tags/good-data-variable.md b/src/fixtures/fixtures/liquid-tags/good-data-variable.md
index bdce079cf9..979170da07 100644
--- a/src/fixtures/fixtures/liquid-tags/good-data-variable.md
+++ b/src/fixtures/fixtures/liquid-tags/good-data-variable.md
@@ -3,7 +3,6 @@ title: Good sample page
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 ---
 
diff --git a/src/fixtures/fixtures/page-with-optional-attributes.md b/src/fixtures/fixtures/page-with-optional-attributes.md
index 2785cda4d9..4b8bfec714 100644
--- a/src/fixtures/fixtures/page-with-optional-attributes.md
+++ b/src/fixtures/fixtures/page-with-optional-attributes.md
@@ -3,7 +3,6 @@ title: My attributes are empty if not FPT
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 product: '{% ifversion fpt %}FPT rulez!{% endif %}'
 permissions: '{% ifversion fpt %}FPT only!{% endif %}'
diff --git a/src/fixtures/fixtures/translations/ja-jp/content/get-started/index.md b/src/fixtures/fixtures/translations/ja-jp/content/get-started/index.md
index 61fda7b842..a9a82892c7 100644
--- a/src/fixtures/fixtures/translations/ja-jp/content/get-started/index.md
+++ b/src/fixtures/fixtures/translations/ja-jp/content/get-started/index.md
@@ -5,6 +5,5 @@ intro: '{% data variables.product.prodname_dotcom %} を使用してソフトウ
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 ---
diff --git a/src/frame/lib/page-data.js b/src/frame/lib/page-data.js
index 6a3b4751f2..bcb1c60cde 100644
--- a/src/frame/lib/page-data.js
+++ b/src/frame/lib/page-data.js
@@ -274,11 +274,17 @@ export async function loadSiteTree(unversionedTree) {
 
 export async function versionPages(obj, version, langCode) {
   // Add a versioned href as a convenience for use in layouts.
-  obj.href = obj.page.permalinks.find(
+  const permalink = obj.page.permalinks.find(
     (pl) =>
       pl.pageVersion === version ||
       (pl.pageVersion === 'homepage' && version === nonEnterpriseDefaultVersion),
-  ).href
+  )
+  if (!permalink) {
+    throw new Error(
+      `No permalink for ${obj.page.fullPath} in language ${langCode} for version ${version}`,
+    )
+  }
+  obj.href = permalink.href
 
   if (!obj.childPages) return obj
   const versionedChildPages = await Promise.all(
diff --git a/src/versions/lib/all-versions.js b/src/versions/lib/all-versions.js
index 44283eb239..7ed6b21fc2 100755
--- a/src/versions/lib/all-versions.js
+++ b/src/versions/lib/all-versions.js
@@ -49,10 +49,7 @@ const plans = [
     openApiBaseName: 'ghes-',
     miscBaseName: 'ghes-',
   },
-  // github-ae is gone, but we need to keep it in the array
-  // for the validation of front matter when it checks the `versions`
-  // keys.
-  // All requests for github-ae@latest will be redirected in getRedirect().
+
   {
     plan: 'github-ae',
     planTitle: 'GitHub AE',