diff --git a/.github/workflows/check_for_new_fragments.yml b/.github/workflows/check_for_new_fragments.yml
new file mode 100644
index 00000000000..2e7fad2c7fa
--- /dev/null
+++ b/.github/workflows/check_for_new_fragments.yml
@@ -0,0 +1,35 @@
+name: Block PRs with New Fragments
+on:
+  pull_request:
+    branches: [main]
+jobs:
+  checkForNewFragments:
+    name: Check for new fragments
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 https://github.com/actions/checkout/commit/f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - name: Check if there are new fragments
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1 https://github.com/actions/github-script/commit/d7906e4ad0b1822421a7e6a35d5ca353c962f410
+        id: new-fragments-boolean
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          result-encoding: string
+          script: |
+            const { getAddedFragments } = require('./.github/workflows/scripts/check_for_new_fragments.js');
+            return getAddedFragments({github, context, core});
+      - name: Add Comment to PR if new fragments have been added
+        if: ${{ steps.new-fragments-boolean.outputs.result > 0 }}
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1 https://github.com/actions/github-script/commit/d7906e4ad0b1822421a7e6a35d5ca353c962f410
+        env:
+          CURRENT_BRANCH: ${{ github.head_ref }}
+          CURRENT_REPO: ${{ github.repository }}
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { addComment } = require('./.github/workflows/scripts/check_for_new_fragments.js');
+            addComment({github, context});
+      - name: Fail if new fragments have been added
+        if: ${{ steps.new-fragments-boolean.outputs.result > 0 }}
+        run: exit 1
+     
diff --git a/.github/workflows/scripts/check_for_new_fragments.js b/.github/workflows/scripts/check_for_new_fragments.js
new file mode 100644
index 00000000000..6c18d552bb6
--- /dev/null
+++ b/.github/workflows/scripts/check_for_new_fragments.js
@@ -0,0 +1,42 @@
+module.exports = {
+  getAddedFragments: ({ github, context, core }) => {
+    const {
+      issue: { number: issue_number },
+      repo: { owner, repo }
+    } = context;
+
+    // Use the Github API to query for the list of files from the PR
+    return github.paginate(
+      'GET /repos/{owner}/{repo}/pulls/{pull_number}/files',
+      { owner, repo, pull_number: issue_number },
+      (response) => {
+        const newFragments = [];
+        response.data.forEach((file) => {
+          if (
+            file.status === 'added' &&
+            file.filename.startsWith('src/fragments')
+          ) {
+            newFragments.push(file);
+          }
+        });
+        return newFragments.length;
+      }
+    );
+  },
+
+  addComment: async ({ github, context }) => {
+    const {
+      issue: { number: issue_number },
+      repo: { owner, repo }
+    } = context;
+
+    const useInlineFiltersComment =
+      'Amplify Docs is moving away from the use of Fragments. Please instead use InlineFilter. See our [README](https://github.com/aws-amplify/docs/blob/main/Readme.md#inline-filters) for more information.';
+    github.rest.issues.createComment({
+      owner,
+      repo,
+      issue_number,
+      body: useInlineFiltersComment
+    });
+  }
+};
diff --git a/Readme.md b/Readme.md
index 8648c7b8f8b..a53d3361bfa 100644
--- a/Readme.md
+++ b/Readme.md
@@ -57,6 +57,18 @@ import js from "/src/fragments/lib/datastore/js/conflict.mdx";
 
 This fragment would exist in: `pages/src/fragments/lib/datastore/js/conflict.mdx`
 
+### Inline Filters 
+
+We are incorporating the use of `<InlineFilters>` to add platform-specific content within the context of one page rather than in fragments. These filters allow you to still specify content by platform and they reference platforms using the same naming convention as our fragments. You can enclose your platform-specific content by updating the opening tag:
+
+````md
+<InlineFilter filters={["js", "react-native", "android", "ios", "flutter"]}>
+
+</InlineFilter>
+````
+ 
+If you are updating content on a page, please note any inline filter tags which may be indicating a specific platform as you make your edits.
+
 ### Accordion 
 
 `Accordion` This single-use accordion hides peripheral content until the reader selects to expand the section. This helps you keep your pages focused on the need-to-know information upfront, while also providing readers an option to dive deeper when they choose. These accordions can provide peripheral content such as additional context for beginners, advanced deep dives for those who want to off-road, and troubleshooting guidance for errors users may encounter.
diff --git a/generatePathMap.cjs.js b/generatePathMap.cjs.js
index 312c671ffe8..7e13a7a43ea 100644
--- a/generatePathMap.cjs.js
+++ b/generatePathMap.cjs.js
@@ -61,6 +61,9 @@ function generatePathMap(
     '/lib-v1/q/platform/ios': {
       page: '/lib-v1/q/platform/[platform]'
     },
+    '/lib-v1/q/platform/flutter': {
+      page: '/lib-v1/q/platform/[platform]'
+    },
     '/sdk/q/platform/js': {
       page: '/sdk/q/platform/[platform]'
     },
@@ -114,6 +117,19 @@ function generatePathMap(
       } else if (route.startsWith('/start')) {
         filterKind = 'integration';
       }
+
+      if (filterKind !== '') {
+        const aOrAn = 'aeiou'.includes(filterKind[0]) ? 'an' : 'a';
+        pathMap[route] = {
+          page: '/ChooseFilterPage',
+          query: {
+            address: route,
+            directoryPath: '/ChooseFilterPage',
+            filterKind: filterKind,
+            message: `Choose ${aOrAn} ${filterKind}:`
+          }
+        };
+      }
     }
 
     if (items) {
@@ -183,6 +199,17 @@ function generatePathMap(
         page: `${route}/q/${routeType}/[${routeType}]`
       };
     });
+    const aOrAn = 'aeiou'.includes(routeType[0]) ? 'an' : 'a';
+    pathMap[route] = {
+      page: '/ChooseFilterPage',
+      query: {
+        address: route,
+        directoryPath: '/ChooseFilterPage',
+        filterKind: routeType,
+        filters: filters,
+        message: `Choose ${aOrAn} ${routeType}:`
+      }
+    };
   }
   return pathMap;
 }
diff --git a/next.config.mjs b/next.config.mjs
index f2795e492b1..5ae8c33344f 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -68,11 +68,9 @@ export default async (phase, { defaultConfig }) => {
       // !! WARN !!
       ignoreBuildErrors: true
     },
+    exportPathMap,
     trailingSlash: true,
-    transpilePackages: [
-      '@algolia/autocomplete-shared',
-      'next-image-export-optimizer'
-    ],
+    transpilePackages: ['@algolia/autocomplete-shared', 'next-image-export-optimizer'],
     // eslint-disable-next-line @typescript-eslint/require-await
     async headers() {
       return [
diff --git a/package.json b/package.json
index f115a4e0d4f..85448646968 100644
--- a/package.json
+++ b/package.json
@@ -128,11 +128,7 @@
     ],
     "setupFilesAfterEnv": [
       "<rootDir>/jest.setup.js"
-    ],
-    "moduleNameMapper": {
-      "\\.(css|less|scss)$": "<rootDir>/src/__mocks__/styleMock.js"
-    },
-    "transformIgnorePatterns": []
+    ]
   },
   "scripts": {
     "clean": "rm -rf node_modules yarn.lock",
diff --git a/src/__mocks__/styleMock.js b/src/__mocks__/styleMock.js
deleted file mode 100644
index f053ebf7976..00000000000
--- a/src/__mocks__/styleMock.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = {};
diff --git a/src/components/Accordion/index.tsx b/src/components/Accordion/index.tsx
index 6a4a59e323f..f861f4a74f8 100644
--- a/src/components/Accordion/index.tsx
+++ b/src/components/Accordion/index.tsx
@@ -20,11 +20,6 @@ const Accordion: React.FC<AccordionProps> = ({
   const [expandedHeight, setExpandedHeight] = useState(0);
   const docsExpander = useRef<HTMLElement>(null);
 
-  let pathName = '';
-  if (typeof window !== 'undefined') {
-    pathName = window.location.pathname;
-  }
-
   useEffect(() => {
     const expander = docsExpander.current;
 
@@ -67,7 +62,7 @@ const Accordion: React.FC<AccordionProps> = ({
 
   const anchor = createElement(
     'a',
-    { href: pathName + '#' + headingId },
+    { href: window.location.pathname + '#' + headingId },
     expanderTitle
   );
 
diff --git a/src/components/Card/styles.tsx b/src/components/Card/styles.tsx
index 26f5c7ff82a..6775d0df09a 100644
--- a/src/components/Card/styles.tsx
+++ b/src/components/Card/styles.tsx
@@ -28,7 +28,7 @@ const docsCard: React.FC<CardProps> = ({
   href,
   external
 }) => {
-  const target = external ? '_blank' : 'self';
+  const target = external ? '_blank' : undefined;
   if (!href) return <div className={className}>{children}</div>;
   return (
     <InternalLink href={href} passHref={true} legacyBehavior>
diff --git a/src/components/FeaturesGrid/__tests__/FeaturesGrid.test.tsx b/src/components/FeaturesGrid/__tests__/FeaturesGrid.test.tsx
index 50e2284148d..7b4fa1e8fc7 100644
--- a/src/components/FeaturesGrid/__tests__/FeaturesGrid.test.tsx
+++ b/src/components/FeaturesGrid/__tests__/FeaturesGrid.test.tsx
@@ -2,17 +2,6 @@ import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import FeaturesGrid from '../index';
 
-jest.mock('next/router', () => ({
-  useRouter() {
-    return {
-      route: '/',
-      pathname: '',
-      query: '',
-      asPath: ''
-    };
-  }
-}));
-
 describe('FeaturesGrid', () => {
   const featureSections = [
     'Authentication',
diff --git a/src/components/FilterChildren/index.tsx b/src/components/FilterChildren/index.tsx
index ffb2847138e..fb81abdc9e1 100644
--- a/src/components/FilterChildren/index.tsx
+++ b/src/components/FilterChildren/index.tsx
@@ -1,8 +1,9 @@
 import { useRouter } from 'next/router';
 
-export default function FilterChildren({ children, filterKey = '' }) {
+export default function FilterChildren({ children }) {
   const router = useRouter();
 
+  let filterKey = '';
   if ('platform' in router.query) {
     filterKey = router.query.platform as string;
   } else if ('integration' in router.query) {
diff --git a/src/components/Fragments/index.tsx b/src/components/Fragments/index.tsx
index 72cde1196e9..e953399107f 100644
--- a/src/components/Fragments/index.tsx
+++ b/src/components/Fragments/index.tsx
@@ -7,10 +7,8 @@ export default function Fragments({ fragments }) {
   let frontmatter: MdxFrontmatterType;
 
   const { state, dispatch } = useLastUpdatedDatesContext();
-  let filterKey = '';
 
   for (const key in fragments) {
-    if (!filterKey) filterKey = key;
     const fragment = fragments[key]([]);
     frontmatter = fragment.props.frontmatter;
 
@@ -31,5 +29,5 @@ export default function Fragments({ fragments }) {
     children.push(<div key={key}>{fragment}</div>);
   }
 
-  return <FilterChildren filterKey={filterKey}>{children}</FilterChildren>;
+  return <FilterChildren>{children}</FilterChildren>;
 }
diff --git a/src/components/InternalLink/__tests__/InternalLink.test.tsx b/src/components/InternalLink/__tests__/InternalLink.test.tsx
index 4eb419d734c..0be6b816961 100644
--- a/src/components/InternalLink/__tests__/InternalLink.test.tsx
+++ b/src/components/InternalLink/__tests__/InternalLink.test.tsx
@@ -1,31 +1,20 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import InternalLink from '../index';
-import { PageContext } from '../../Page';
 
-const pageContext = {
+const localStorageMock = jest.spyOn(
+  require('../../../utils/parseLocalStorage'),
+  'parseLocalStorage'
+);
+localStorageMock.mockReturnValue({
   platform: 'js',
   integration: 'js',
   framework: 'js'
-};
+});
 
-jest.mock('next/router', () => ({
-  useRouter() {
-    return {
-      route: '/',
-      pathname: '',
-      query: '',
-      asPath: ''
-    };
-  }
-}));
 describe('InternalLink', () => {
   it('should render the InternalLink component', async () => {
-    render(
-      <PageContext.Provider value={pageContext}>
-        <InternalLink href="/lib/auth">Internal Link</InternalLink>
-      </PageContext.Provider>
-    );
+    render(<InternalLink href="/lib/auth">Internal Link</InternalLink>);
 
     const linkNode = await screen.findByText('Internal Link');
     expect(linkNode).toBeInTheDocument();
@@ -33,11 +22,7 @@ describe('InternalLink', () => {
 
   it('should add the platform to the link', async () => {
     const href = '/lib/libFile';
-    render(
-      <PageContext.Provider value={pageContext}>
-        <InternalLink href={href}>Internal Link</InternalLink>
-      </PageContext.Provider>
-    );
+    render(<InternalLink href={href}>Internal Link</InternalLink>);
 
     const linkNode = await screen.findByText('Internal Link');
     const linkHref = linkNode.href;
@@ -46,11 +31,7 @@ describe('InternalLink', () => {
 
   it('should add the integration to the link', async () => {
     const href = '/start/startFile';
-    render(
-      <PageContext.Provider value={pageContext}>
-        <InternalLink href={href}>Internal Link</InternalLink>
-      </PageContext.Provider>
-    );
+    render(<InternalLink href={href}>Internal Link</InternalLink>);
 
     const linkNode = await screen.findByText('Internal Link');
     const linkHref = linkNode.href;
@@ -59,11 +40,7 @@ describe('InternalLink', () => {
 
   it('should add the framework to the link', async () => {
     const href = '/ui/uiFile';
-    render(
-      <PageContext.Provider value={pageContext}>
-        <InternalLink href={href}>Internal Link</InternalLink>
-      </PageContext.Provider>
-    );
+    render(<InternalLink href={href}>Internal Link</InternalLink>);
 
     const linkNode = await screen.findByText('Internal Link');
     const linkHref = linkNode.href;
@@ -72,11 +49,7 @@ describe('InternalLink', () => {
 
   it('should not change the href if the platform already exists', async () => {
     const href = '/lib/libFile/q/platform/js';
-    render(
-      <PageContext.Provider value={pageContext}>
-        <InternalLink href={href}>Internal Link</InternalLink>
-      </PageContext.Provider>
-    );
+    render(<InternalLink href={href}>Internal Link</InternalLink>);
 
     const expectedHref = `http://localhost${href}`;
     const linkNode = await screen.findByText('Internal Link');
diff --git a/src/components/InternalLink/index.tsx b/src/components/InternalLink/index.tsx
index ee2d097ef5f..c49b914d22e 100644
--- a/src/components/InternalLink/index.tsx
+++ b/src/components/InternalLink/index.tsx
@@ -1,12 +1,8 @@
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { useContext } from 'react';
-import { PageContext } from '../Page';
+import { parseLocalStorage } from '../../utils/parseLocalStorage';
 
 export default function InternalLink({ href, children }) {
-  const router = useRouter();
-  const filterKeys = useContext(PageContext);
-
   let filterKind = '';
   if (href.startsWith('/cli') || href.startsWith('/console')) {
     filterKind = '';
@@ -24,6 +20,7 @@ export default function InternalLink({ href, children }) {
 
   if (filterKind != '') {
     if (!href.includes(`/q/${filterKind}/`)) {
+      const filterKeys = parseLocalStorage('filterKeys', {});
       if (filterKind in filterKeys) {
         const filterKey = filterKeys[filterKind];
         if (href.includes('#')) {
@@ -37,6 +34,7 @@ export default function InternalLink({ href, children }) {
   }
 
   if (href[0] === '#') {
+    const router = useRouter();
     const prevPath = router.asPath.split('#')[0];
     href = prevPath + href;
   }
diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx
index f5ffe8e7a63..f6cd4a6d192 100644
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
@@ -3,6 +3,7 @@ import SecondaryNav from '../SecondaryNav/index';
 import Footer from '../Footer/index';
 import { LayoutStyle } from './styles';
 import { Container } from '../Container';
+import { useRouter } from 'next/router';
 import { GlobalNav, NavMenuItem } from '../GlobalNav/GlobalNav';
 import {
   LEFT_NAV_LINKS,
@@ -25,6 +26,9 @@ const Layout = forwardRef(function Layout(
   },
   footerRef
 ) {
+  const router = useRouter();
+  if (!router.isReady) return <></>;
+
   const filterMetadata = filterKey
     ? filterMetadataByOption[filterKey].label
     : '';
diff --git a/src/components/Menu/Directory/__tests__/Directory.test.tsx b/src/components/Menu/Directory/__tests__/Directory.test.tsx
index bfaf8aa3825..39ffe95f86f 100644
--- a/src/components/Menu/Directory/__tests__/Directory.test.tsx
+++ b/src/components/Menu/Directory/__tests__/Directory.test.tsx
@@ -3,17 +3,6 @@ import { render, screen } from '@testing-library/react';
 import Directory from '../index';
 import directory from '../../../../directory/directory.mjs';
 
-jest.mock('next/router', () => ({
-  useRouter() {
-    return {
-      route: '/',
-      pathname: '',
-      query: '',
-      asPath: ''
-    };
-  }
-}));
-
 describe('Directory', () => {
   const directoryKeys = Object.keys(directory);
 
diff --git a/src/components/Menu/FilterSelect/__tests__/FilterSelect.test.tsx b/src/components/Menu/FilterSelect/__tests__/FilterSelect.test.tsx
index 9e80b865df6..204732ccbf7 100644
--- a/src/components/Menu/FilterSelect/__tests__/FilterSelect.test.tsx
+++ b/src/components/Menu/FilterSelect/__tests__/FilterSelect.test.tsx
@@ -6,17 +6,6 @@ import {
   filterMetadataByOption
 } from '../../../../utils/filter-data';
 
-jest.mock('next/router', () => ({
-  useRouter() {
-    return {
-      route: '/',
-      pathname: '',
-      query: '',
-      asPath: ''
-    };
-  }
-}));
-
 describe('FilterSelect', () => {
   describe('General Behavior', () => {
     const filterKind = 'platform';
diff --git a/src/components/Menu/FilterSelect/index.tsx b/src/components/Menu/FilterSelect/index.tsx
index c5396fed6eb..2359a6d2871 100644
--- a/src/components/Menu/FilterSelect/index.tsx
+++ b/src/components/Menu/FilterSelect/index.tsx
@@ -118,7 +118,7 @@ export default class FilterSelect extends React.Component<
     }
 
     return (
-      <div className="filter-row" key={name}>
+      <div className="filter-row">
         <img
           alt=""
           src={filterMetadataByOption[name]?.graphicURI}
diff --git a/src/components/Menu/__tests__/Menu.test.tsx b/src/components/Menu/__tests__/Menu.test.tsx
index 8cf2ebdf7bb..06ae8a6bfbe 100644
--- a/src/components/Menu/__tests__/Menu.test.tsx
+++ b/src/components/Menu/__tests__/Menu.test.tsx
@@ -20,17 +20,6 @@ Object.defineProperty(window, 'matchMedia', {
 
 const directoryKeys = Object.keys(directory);
 
-jest.mock('next/router', () => ({
-  useRouter() {
-    return {
-      route: '/',
-      pathname: '',
-      query: '',
-      asPath: ''
-    };
-  }
-}));
-
 describe('Menu', () => {
   directoryKeys.forEach((directoryKey) => {
     it(`should render the Menu component with the ${directoryKey} key`, async () => {
diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx
index 4048afc084f..27952921158 100644
--- a/src/components/Menu/index.tsx
+++ b/src/components/Menu/index.tsx
@@ -36,7 +36,7 @@ function Menu(props: MenuProps, ref) {
   const [isOpen, setIsOpen] = useState(true);
   const { state } = useLastUpdatedDatesContext();
   const menuRef = useRef<HTMLElement>(null);
-  const [onDesktop, setOnDesktop] = useState(true);
+  const [onDesktop, setOnDesktop] = useState(false);
 
   useEffect(() => {
     const MQDesktopJS = MQDesktop.substring(6);
diff --git a/src/components/NextPrevious/styles.tsx b/src/components/NextPrevious/styles.tsx
index 6fe0301ee01..4d814080217 100644
--- a/src/components/NextPrevious/styles.tsx
+++ b/src/components/NextPrevious/styles.tsx
@@ -40,7 +40,7 @@ export const NextPreviousLinkStyle = styled.a`
     width: 0.5rem;
   }
 
-  &:first-of-type {
+  &:first-child {
     img {
       margin-left: 0;
       margin-right: 1rem;
diff --git a/src/components/Page/index.tsx b/src/components/Page/index.tsx
index e272d6b82eb..d04c92350aa 100644
--- a/src/components/Page/index.tsx
+++ b/src/components/Page/index.tsx
@@ -7,12 +7,12 @@ import {
   getChapterDirectory,
   isProductRoot
 } from '../../utils/getLocalDirectory';
-import { useEffect, useRef, useState, createContext } from 'react';
+import { useRef } from 'react';
 import {
   filterMetadataByOption,
   SelectedFilters
 } from '../../utils/filter-data';
-import ChooseFilterPage from '../ChooseFilterPage';
+import ChooseFilterPage from '../../pages/ChooseFilterPage';
 import { parseLocalStorage } from '../../utils/parseLocalStorage';
 import { withFilterOverrides } from '../../utils/withFilterOverrides';
 
@@ -20,28 +20,21 @@ export type MdxFrontmatterType = {
   lastUpdated: string;
 };
 
-export const PageContext = createContext({});
-
 export default function Page({
   children,
   meta,
-  frontmatter,
-  platform = '',
-  filterKind = ''
+  frontmatter
 }: {
   children: any;
   meta?: any;
   frontmatter?: MdxFrontmatterType;
-  platform?: string;
-  filterKind?: string;
 }) {
   const footerRef = useRef(null);
   const router = useRouter();
-  const [filterKeysLoaded, setFilterKeysLoaded] = useState({});
 
-  useEffect(() => {
-    setFilterKeysLoaded(parseLocalStorage('filterKeys', {} as SelectedFilters));
-  }, []);
+  if (!router.isReady) {
+    return <></>;
+  }
 
   let url = router.asPath;
   // remove trailing slash.  this is important on pages like /cli/index.mdx
@@ -53,11 +46,13 @@ export default function Page({
 
   const directoryPath = router.pathname;
 
-  let filterKey = platform;
+  let filterKey = '',
+    filterKind = '';
+  const filterKeysLoaded = parseLocalStorage(
+    'filterKeys',
+    {} as SelectedFilters
+  );
   const filterKeyUpdates = {} as SelectedFilters;
-  if (filterKey && filterKind) {
-    filterKeyUpdates[filterKind] = filterKey;
-  }
   if ('platform' in router.query) {
     filterKey = router.query.platform as string;
     filterKeyUpdates.platform = filterKey;
@@ -87,18 +82,8 @@ export default function Page({
     ...overrides
   };
 
-  useEffect(() => {
-    if (Object.keys(filterKeys).length !== 0) {
-      localStorage.setItem('filterKeys', JSON.stringify(filterKeys));
-    }
-  }, [filterKeys]);
-
-  if (
-    filterKey &&
-    filters.length !== 0 &&
-    !filters.includes(filterKey) &&
-    meta
-  ) {
+  localStorage.setItem('filterKeys', JSON.stringify(filterKeys));
+  if (filters.length !== 0 && !filters.includes(filterKey) && meta) {
     return (
       <ChooseFilterPage
         directoryPath="/ChooseFilterPage"
@@ -106,7 +91,7 @@ export default function Page({
         filterKind={filterKind}
         filters={filters}
         currentFilter={filterKey}
-        message={`${filterMetadataByOption[filterKey]?.label} is not supported on this page.  Please select one of the following:`}
+        message={`${filterMetadataByOption[filterKey].label} is not supported on this page.  Please select one of the following:`}
       />
     );
   }
@@ -127,31 +112,29 @@ export default function Page({
   }
 
   return (
-    <PageContext.Provider value={filterKeys}>
-      <Layout
-        meta={meta}
-        filterKey={filterKey}
-        filterMetadataByOption={filterMetadataByOption}
-        ref={footerRef}
-      >
-        {meta ? (
-          <MetaContent
-            title={meta.title}
-            chapterTitle={meta.chapterTitle}
-            headers={headers}
-            children={children}
-            filters={filters}
-            filterKey={filterKey}
-            filterKind={filterKind}
-            url={url}
-            directoryPath={directoryPath}
-            parentPageLastUpdatedDate={parentPageLastUpdatedDate}
-            footerRef={footerRef}
-          />
-        ) : (
-          children
-        )}
-      </Layout>
-    </PageContext.Provider>
+    <Layout
+      meta={meta}
+      filterKey={filterKey}
+      filterMetadataByOption={filterMetadataByOption}
+      ref={footerRef}
+    >
+      {meta ? (
+        <MetaContent
+          title={meta.title}
+          chapterTitle={meta.chapterTitle}
+          headers={headers}
+          children={children}
+          filters={filters}
+          filterKey={filterKey}
+          filterKind={filterKind}
+          url={url}
+          directoryPath={directoryPath}
+          parentPageLastUpdatedDate={parentPageLastUpdatedDate}
+          footerRef={footerRef}
+        />
+      ) : (
+        children
+      )}
+    </Layout>
   );
 }
diff --git a/src/components/Page/metaContent.tsx b/src/components/Page/metaContent.tsx
index 905e0d3c7c6..a5a031d5713 100644
--- a/src/components/Page/metaContent.tsx
+++ b/src/components/Page/metaContent.tsx
@@ -4,7 +4,7 @@ import TableOfContents from '../TableOfContents/index';
 import NextPrevious from '../NextPrevious/index';
 import { ContentStyle, ChapterTitleStyle } from './styles';
 import MobileMenuIcons from '../MobileMenuIcons';
-import { useRef, useState, useEffect } from 'react';
+import { useRef, useState } from 'react';
 import { MQDesktop } from '../media';
 import Feedback from '../Feedback';
 import LastUpdatedDatesProvider from '../LastUpdatedProvider';
@@ -39,18 +39,14 @@ export default function MetaContent({
   const buttonsRef = useRef(null);
   const contentsRef = useRef(null);
   const [menuIsOpen, setMenuIsOpen] = useState(false);
-  const [onDesktop, setOnDesktop] = useState(true);
 
   // Slice off the "@media " string at the start for use in JS instead of CSS
   const MQDesktopJS = MQDesktop.substring(6);
   // If the media query matches, then the user is on desktop and should not see the mobile toggle
-  useEffect(() => {
-    setOnDesktop(
-      typeof window === 'undefined'
-        ? false
-        : window.matchMedia(MQDesktopJS).matches
-    );
-  }, []);
+  const onDesktop =
+    typeof window === 'undefined'
+      ? false
+      : window.matchMedia(MQDesktopJS).matches;
 
   return (
     <>
diff --git a/src/components/SecondaryNav/index.tsx b/src/components/SecondaryNav/index.tsx
index 01620abe100..5b5f77cda69 100644
--- a/src/components/SecondaryNav/index.tsx
+++ b/src/components/SecondaryNav/index.tsx
@@ -16,15 +16,15 @@ import ExternalLink from '../ExternalLink';
 import InternalLink from '../InternalLink';
 import { useRouter } from 'next/router';
 import { Container } from '../Container';
-import { useContext } from 'react';
-import { PageContext } from '../Page';
+import { parseLocalStorage } from '../../utils/parseLocalStorage';
 
 import SearchBar from '../SearchBar';
 
 export default function SecondaryNav() {
-  const filterKeys = useContext(PageContext);
   const router = useRouter();
   const path = router.asPath;
+  const filterKeys = parseLocalStorage('filterKeys', {});
+
   return (
     <HostStyle as="nav">
       <Container>
diff --git a/src/components/SecondaryNav/styles.tsx b/src/components/SecondaryNav/styles.tsx
index e4467c2264d..9db49fba314 100644
--- a/src/components/SecondaryNav/styles.tsx
+++ b/src/components/SecondaryNav/styles.tsx
@@ -41,7 +41,7 @@ export const SecondaryNavStyle = styled.div`
     a {
       margin-left: 1.75rem;
 
-      &:first-of-type {
+      &:first-child {
         margin-left: 0;
       }
 
diff --git a/src/components/TableOfContents/index.tsx b/src/components/TableOfContents/index.tsx
index da9b4f0e12f..df7715be473 100644
--- a/src/components/TableOfContents/index.tsx
+++ b/src/components/TableOfContents/index.tsx
@@ -7,11 +7,10 @@ import {
   H3AnchorStyle,
   HeaderStyle
 } from './styles';
-import { forwardRef, useEffect, useState } from 'react';
+import { forwardRef, useEffect } from 'react';
 import { useRouter } from 'next/router';
 import { MQDesktop } from '../media';
 import { CloseIcon } from '../Icons';
-import { truncate } from 'fs';
 
 const stickyHeaderHeight = 124;
 function scroll(hash) {
@@ -25,26 +24,26 @@ function scroll(hash) {
 function TableOfContents({ children, title, buttonsRef }, ref) {
   const router = useRouter();
   const MQDesktopJS = MQDesktop.substring(6);
-  const [onDesktop, setOnDesktop] = useState(true);
+  const onDesktop =
+    typeof window === 'undefined'
+      ? false
+      : window.matchMedia(MQDesktopJS).matches;
+
+  if (children.length === 0) {
+    return <></>;
+  }
+  window.onload = (_) => {
+    if (window.location.href.includes('#')) {
+      const hash = window.location.href.split('#')[1];
+      scroll(hash);
+    }
+  };
 
   let headers = [];
   let headerQueries = [];
   let activeLink = 0;
   let previousLink = -1;
   useEffect(() => {
-    setOnDesktop(
-      typeof window === 'undefined'
-        ? false
-        : window.matchMedia(MQDesktopJS).matches
-    );
-
-    window.onload = (_) => {
-      if (window.location.href.includes('#')) {
-        const hash = window.location.href.split('#')[1];
-        scroll(hash);
-      }
-    };
-
     const idSet = new Set();
     const pageHeadings = document.querySelectorAll('a > h2, a > h3');
     const headings = [];
@@ -57,6 +56,7 @@ function TableOfContents({ children, title, buttonsRef }, ref) {
         headings.push(heading);
       }
     });
+    // console.log(document.getElementById('toc')?.querySelectorAll('a'))
     const headings2 = document.getElementById('toc')?.querySelectorAll('a');
     for (let i = 0; i < headings.length; ++i) {
       const id = headings[i].id;
@@ -77,15 +77,13 @@ function TableOfContents({ children, title, buttonsRef }, ref) {
         setTimeout(scroll.bind(undefined, uniqueId), 50);
         return false;
       };
-      if (headings2 && headings2[i]) {
-        headings2[i].onclick = () => {
-          if (headings[i].classList.contains('docs-expander__title')) {
-            uniqueId = headings[i].parentNode.parentNode.parentNode.id;
-          }
-          setTimeout(scroll.bind(undefined, uniqueId), 50);
-          return false;
-        };
-      }
+      headings2[i].onclick = () => {
+        if (headings[i].classList.contains('docs-expander__title')) {
+          uniqueId = headings[i].parentNode.parentNode.parentNode.id;
+        }
+        setTimeout(scroll.bind(undefined, uniqueId), 50);
+        return false;
+      };
     }
     headers = Array.from(headings).map((heading) => heading.id);
     headerQueries = headers.map((header) => {
@@ -152,7 +150,7 @@ function TableOfContents({ children, title, buttonsRef }, ref) {
     }
   };
 
-  return children.length ? (
+  return (
     <TOCStyle id="toc" ref={ref}>
       <TOCInnerStyle>
         {!onDesktop && (
@@ -177,8 +175,6 @@ function TableOfContents({ children, title, buttonsRef }, ref) {
         })}
       </TOCInnerStyle>
     </TOCStyle>
-  ) : (
-    <></>
   );
 }
 
diff --git a/src/components/ChooseFilterPage/index.tsx b/src/pages/ChooseFilterPage.tsx
similarity index 87%
rename from src/components/ChooseFilterPage/index.tsx
rename to src/pages/ChooseFilterPage.tsx
index fe5e48b7bce..3ebc75f5792 100644
--- a/src/components/ChooseFilterPage/index.tsx
+++ b/src/pages/ChooseFilterPage.tsx
@@ -1,19 +1,19 @@
-import Layout from '../Layout';
+import Layout from '../components/Layout';
 import styled from '@emotion/styled';
 import { Grid } from '@theme-ui/components';
 import { useEffect, useRef, useState } from 'react';
-import MetaContent from '../Page/metaContent';
-import { Container } from '../Container';
-import { Card, CardDetail, CardGraphic } from '../Card';
+import MetaContent from '../components/Page/metaContent';
+import { Container } from '../components/Container';
+import { Card, CardDetail, CardGraphic } from '../components/Card';
 import {
   filterOptionsByName,
   filterMetadataByOption
-} from '../../utils/filter-data';
+} from '../utils/filter-data';
 import {
   getChapterDirectory,
   getProductDirectory,
   isProductRoot
-} from '../../utils/getLocalDirectory';
+} from '../utils/getLocalDirectory';
 
 const H3 = styled.h3`
   margin-top: 0.375rem;
@@ -34,6 +34,7 @@ function ChooseFilterPage({
   // "url" cannot be a CFP prop for legacy reasons
   let url = address;
   const [_, setHref] = useState('https://docs.amplify.aws');
+  const [menuIsOpen, setMenuIsOpen] = useState(false);
   const footerRef = useRef(null);
 
   useEffect(() => {
@@ -124,4 +125,7 @@ function ChooseFilterPage({
   );
 }
 
+ChooseFilterPage.getInitialProps = (initialProps) => {
+  return initialProps.query;
+};
 export default ChooseFilterPage;
diff --git a/src/pages/cli/q/integration/[integration].mdx b/src/pages/cli/q/integration/[integration].mdx
index 3c259270fdf..f3f8d57f77d 100644
--- a/src/pages/cli/q/integration/[integration].mdx
+++ b/src/pages/cli/q/integration/[integration].mdx
@@ -2,25 +2,6 @@ export const meta = {
   title: "Typical workflows",
   description:
     "How to initialize a new Amplify project and other typical Amplify CLI workflows & commands.",
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 ## Initialize new project
diff --git a/src/pages/guides/api-graphql/building-a-form-api/q/platform/[platform].mdx b/src/pages/guides/api-graphql/building-a-form-api/q/platform/[platform].mdx
index 7f5b0f71ac3..cd673c82d4d 100644
--- a/src/pages/guides/api-graphql/building-a-form-api/q/platform/[platform].mdx
+++ b/src/pages/guides/api-graphql/building-a-form-api/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Building a Form API with GraphQL`,
   description: `How to implement pagination with GraphQL`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 In this guide you will learn how to build and interact with a Form API using Amplify.
diff --git a/src/pages/guides/api-graphql/graphql-pagination/q/platform/[platform].mdx b/src/pages/guides/api-graphql/graphql-pagination/q/platform/[platform].mdx
index 4f3099a1560..58e85d9efab 100644
--- a/src/pages/guides/api-graphql/graphql-pagination/q/platform/[platform].mdx
+++ b/src/pages/guides/api-graphql/graphql-pagination/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `GraphQL pagination`,
   description: `How to implement pagination with GraphQL `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 In this guide you will learn how to implement pagination in your GraphQL API.
diff --git a/src/pages/guides/api-graphql/image-and-file-uploads/q/platform/[platform].mdx b/src/pages/guides/api-graphql/image-and-file-uploads/q/platform/[platform].mdx
index b58670f3772..a4e0c4d42c4 100644
--- a/src/pages/guides/api-graphql/image-and-file-uploads/q/platform/[platform].mdx
+++ b/src/pages/guides/api-graphql/image-and-file-uploads/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `How to Manage Image & File Uploads & Downloads`,
   description: `How to manage image and file uploads and downloads with GraphQL and AWS Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/api-graphql/js/image-and-file-uploads.mdx";
diff --git a/src/pages/guides/api-graphql/lambda-resolvers/q/platform/[platform].mdx b/src/pages/guides/api-graphql/lambda-resolvers/q/platform/[platform].mdx
index 36ebe898286..d058f3b9836 100644
--- a/src/pages/guides/api-graphql/lambda-resolvers/q/platform/[platform].mdx
+++ b/src/pages/guides/api-graphql/lambda-resolvers/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `How to use Lambda GraphQL Resolvers`,
   description: `How to use Lambda GraphQL resolvers to interact with other services`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 The [GraphQL Transform Library](/cli/graphql/custom-business-logic#lambda-function-resolver) provides a `@function` directive that enables the configuration of AWS Lambda function resolvers within your GraphQL API. In this guide you will learn how to use Lambda functions as GraphQL resolvers to interact with other services and APIs using the `@function` directive.
diff --git a/src/pages/guides/api-graphql/query-with-sorting/q/platform/[platform].mdx b/src/pages/guides/api-graphql/query-with-sorting/q/platform/[platform].mdx
index e193ae39c54..95dff00c684 100644
--- a/src/pages/guides/api-graphql/query-with-sorting/q/platform/[platform].mdx
+++ b/src/pages/guides/api-graphql/query-with-sorting/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `GraphQL query with sorting by date`,
   description: `How to implement sorting in a GraphQL query`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 In this guide you will learn how to implement sorting in a GraphQL API. In our example, you will implement sorting results by date in either an ascending or descending order by implementing an additional data access pattern leveraging a DynamoDB Global Secondary Index using the `@index` GraphQL Transformer directive.
diff --git a/src/pages/guides/api-graphql/subscriptions-by-id/q/platform/[platform].mdx b/src/pages/guides/api-graphql/subscriptions-by-id/q/platform/[platform].mdx
index d3fd181aa01..4e650917cf3 100644
--- a/src/pages/guides/api-graphql/subscriptions-by-id/q/platform/[platform].mdx
+++ b/src/pages/guides/api-graphql/subscriptions-by-id/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `How to create GraphQL subscriptions by id`,
   description: `How to create a custom GraphQL subscription that will listen by id`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 In this guide you will learn how to create a custom GraphQL subscription that will only by connected and triggered by a mutation containing a specific ID as an argument.
diff --git a/src/pages/guides/api-rest/express-server/q/platform/[platform].mdx b/src/pages/guides/api-rest/express-server/q/platform/[platform].mdx
index 9e142117843..1ac2d8859de 100644
--- a/src/pages/guides/api-rest/express-server/q/platform/[platform].mdx
+++ b/src/pages/guides/api-rest/express-server/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Express server`,
   description: `How to deploy an Express server to AWS using AWS Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 In this guide you'll learn how to deploy an [Express](https://expressjs.com/) web server complete with routing.
diff --git a/src/pages/guides/api-rest/form-api-with-dynamodb-and-lambda/q/platform/[platform].mdx b/src/pages/guides/api-rest/form-api-with-dynamodb-and-lambda/q/platform/[platform].mdx
index 412080aae6d..c632e43f7d0 100644
--- a/src/pages/guides/api-rest/form-api-with-dynamodb-and-lambda/q/platform/[platform].mdx
+++ b/src/pages/guides/api-rest/form-api-with-dynamodb-and-lambda/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Creating a Form API with DynamoDB and Lambda`,
   description: `How to build and interact with a form API with DynamoDB and Lambda`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/api-rest/js/form-api-with-dynamodb-and-lambda.mdx";
diff --git a/src/pages/guides/api-rest/go-api/q/platform/[platform].mdx b/src/pages/guides/api-rest/go-api/q/platform/[platform].mdx
index d94e93c568c..07f28358ee2 100644
--- a/src/pages/guides/api-rest/go-api/q/platform/[platform].mdx
+++ b/src/pages/guides/api-rest/go-api/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Go API`,
   description: `How to deploy a Go API using Amplify Functions`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 In this guide, you will learn how to deploy a Go API.
diff --git a/src/pages/guides/api-rest/node-api/q/platform/[platform].mdx b/src/pages/guides/api-rest/node-api/q/platform/[platform].mdx
index 8fccf03f888..b0edf496faa 100644
--- a/src/pages/guides/api-rest/node-api/q/platform/[platform].mdx
+++ b/src/pages/guides/api-rest/node-api/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `NodeJS API`,
   description: `How to deploy a NodeJS API using Amplify Functions`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 In this guide, you will learn how to deploy a Node.js API.
diff --git a/src/pages/guides/api-rest/python-api/q/platform/[platform].mdx b/src/pages/guides/api-rest/python-api/q/platform/[platform].mdx
index 4d70d0d2c65..71092bd1e34 100644
--- a/src/pages/guides/api-rest/python-api/q/platform/[platform].mdx
+++ b/src/pages/guides/api-rest/python-api/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Python API`,
   description: `How to deploy a Python API using Amplify Functions`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 In this guide, you will learn how to deploy a Python API.
diff --git a/src/pages/guides/authentication/custom-auth-flow/q/platform/[platform].mdx b/src/pages/guides/authentication/custom-auth-flow/q/platform/[platform].mdx
index 1ae7c4aa996..95f6d24c20b 100644
--- a/src/pages/guides/authentication/custom-auth-flow/q/platform/[platform].mdx
+++ b/src/pages/guides/authentication/custom-auth-flow/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Creating a custom authentication flow`,
   description: `Creating a custom authentication flow with AWS Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/authentication/js/custom-auth-flow.mdx";
diff --git a/src/pages/guides/authentication/email-only-authentication/q/platform/[platform].mdx b/src/pages/guides/authentication/email-only-authentication/q/platform/[platform].mdx
index 3f04a54e1d1..434eb284f5f 100644
--- a/src/pages/guides/authentication/email-only-authentication/q/platform/[platform].mdx
+++ b/src/pages/guides/authentication/email-only-authentication/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Email-only sign up and sign in`,
   description: `Enabling users to authenticate with only their email`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/authentication/js/email-only-authentication.mdx";
diff --git a/src/pages/guides/authentication/listening-for-auth-events/q/platform/[platform].mdx b/src/pages/guides/authentication/listening-for-auth-events/q/platform/[platform].mdx
index c729df8a439..9fd59f4ba1d 100644
--- a/src/pages/guides/authentication/listening-for-auth-events/q/platform/[platform].mdx
+++ b/src/pages/guides/authentication/listening-for-auth-events/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Listening for authentication events`,
   description: `Listening for auth events using the Hub utility`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/authentication/js/listening-for-auth-events.mdx";
diff --git a/src/pages/guides/authentication/managing-user-attributes/q/platform/[platform].mdx b/src/pages/guides/authentication/managing-user-attributes/q/platform/[platform].mdx
index c4ef899260f..fb3094c7c07 100644
--- a/src/pages/guides/authentication/managing-user-attributes/q/platform/[platform].mdx
+++ b/src/pages/guides/authentication/managing-user-attributes/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Managing user attributes`,
   description: `How to manage standard and custom user attributes`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/authentication/js/managing-user-attributes.mdx";
diff --git a/src/pages/guides/datastore/parallel-processing/q/platform/[platform].mdx b/src/pages/guides/datastore/parallel-processing/q/platform/[platform].mdx
index c3d9e712e0a..3c3608385e1 100644
--- a/src/pages/guides/datastore/parallel-processing/q/platform/[platform].mdx
+++ b/src/pages/guides/datastore/parallel-processing/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Parallel Processing`,
   description: `How to multiple DataStore operations in parallel.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/guides/datastore/parallel-processing-ios.mdx";
diff --git a/src/pages/guides/functions/appsync-operations-to-lambda-layer/q/platform/[platform].mdx b/src/pages/guides/functions/appsync-operations-to-lambda-layer/q/platform/[platform].mdx
index 1c159009c8f..4f17db8f830 100644
--- a/src/pages/guides/functions/appsync-operations-to-lambda-layer/q/platform/[platform].mdx
+++ b/src/pages/guides/functions/appsync-operations-to-lambda-layer/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Exporting AppSync operations to a Lambda layer for easy reuse`,
   description: `How to export your AppSync operations to a Lambda layer for easy reuse in your Lambda functions`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 When you need to call your AppSync API from a Lambda function, you can export your AppSync operations generated by Amplify to a Lambda layer. This reduces the amount of duplicated code, and allows you to interact with the API from Lambda functions across multiple projects.
diff --git a/src/pages/guides/functions/cognito-trigger-lambda-dynamodb/q/platform/[platform].mdx b/src/pages/guides/functions/cognito-trigger-lambda-dynamodb/q/platform/[platform].mdx
index 695067ca98e..a917ecb2743 100644
--- a/src/pages/guides/functions/cognito-trigger-lambda-dynamodb/q/platform/[platform].mdx
+++ b/src/pages/guides/functions/cognito-trigger-lambda-dynamodb/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Calling DynamoDB using AWS Cognito triggers`,
   description: `How to add an entry in DynamoDB, with user's information after sign-up post-confirmation`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 If you are using AWS Cognito to handle authentication in your application you can use triggers to handle authentication 
diff --git a/src/pages/guides/functions/connecting-a-rest-api/q/platform/[platform].mdx b/src/pages/guides/functions/connecting-a-rest-api/q/platform/[platform].mdx
index 11f0991f49b..cb2afe35ae5 100644
--- a/src/pages/guides/functions/connecting-a-rest-api/q/platform/[platform].mdx
+++ b/src/pages/guides/functions/connecting-a-rest-api/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Connecting a REST API to a Lambda function`,
   description: `How to connect a REST API to a Lambda function`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 In this guide you will learn how to connect a REST API to an existing Lambda function.
diff --git a/src/pages/guides/functions/dynamodb-from-js-lambda/q/platform/[platform].mdx b/src/pages/guides/functions/dynamodb-from-js-lambda/q/platform/[platform].mdx
index 25b2edfb20b..3e96b04bbd4 100644
--- a/src/pages/guides/functions/dynamodb-from-js-lambda/q/platform/[platform].mdx
+++ b/src/pages/guides/functions/dynamodb-from-js-lambda/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Calling DynamoDB from Lambda in Node.js`,
   description: `How to interact with a DynamoDB database from a Lambda function in Node.js`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 The easiest way to interact with DynamoDB from Lambda in a Node.js environment is to use the [DynamoDB document client](https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html). In this guide you will learn how to interact with a DynamoDB database from a Lambda function using the Node.js runtime.
diff --git a/src/pages/guides/functions/dynamodb-from-python-lambda/q/platform/[platform].mdx b/src/pages/guides/functions/dynamodb-from-python-lambda/q/platform/[platform].mdx
index 6c0db745084..5e7ecedf63a 100644
--- a/src/pages/guides/functions/dynamodb-from-python-lambda/q/platform/[platform].mdx
+++ b/src/pages/guides/functions/dynamodb-from-python-lambda/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Calling DynamoDB from a Lambda function in Python`,
   description: `How to interact with a DynamoDB database from a Lambda function in Python`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 The easiest way to interact with DynamoDB from Lambda in a Python environment is to use the [boto3 DynamoDB client](https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/dynamodb.html). In this guide you will learn how to interact with a DynamoDB database from a Lambda function using the Python runtime.
diff --git a/src/pages/guides/functions/graphql-from-lambda/q/platform/[platform].mdx b/src/pages/guides/functions/graphql-from-lambda/q/platform/[platform].mdx
index 6c0779ddc6c..83d2fb106a4 100644
--- a/src/pages/guides/functions/graphql-from-lambda/q/platform/[platform].mdx
+++ b/src/pages/guides/functions/graphql-from-lambda/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Calling GraphQL API from a Lambda function`,
   description: `How to interact with a GraphQL API from a Lambda function`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/lib/graphqlapi/graphql-from-node.mdx";
diff --git a/src/pages/guides/functions/graphql-server-in-lambda/q/platform/[platform].mdx b/src/pages/guides/functions/graphql-server-in-lambda/q/platform/[platform].mdx
index 16ea5bf5ba0..541ef814217 100644
--- a/src/pages/guides/functions/graphql-server-in-lambda/q/platform/[platform].mdx
+++ b/src/pages/guides/functions/graphql-server-in-lambda/q/platform/[platform].mdx
@@ -1,28 +1,9 @@
 export const meta = {
   title: `GraphQL Server in Lambda`,
   description: `How to run an Apollo GraphQL server in a Lambda function`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
 };
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
 
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
-};
-
-In this guide you will learn how to run a GraphQL server in a Lambda function. In this example you will be using [Apollo Server](https://www.apollographql.com/docs/) and [Apollo Server Lambda](https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-lambda), but you can use any server implementation you would like.
+In this guide you will learn how to run a GraphQL server in a Lambda function. In this example you will be using [Apollo Server](https://www.apollographql.com/docs/) and [Apollo Server Lambda](https://www.apollographql.com/docs/apollo-server/deployment/lambda/), but you can use any server implementation you would like.
 
 The end goal is to have an API endpoint, like `https://your-api-endpoint.com/graphql`, deployed and integrated with a GraphQL server running in a serverless function.
 
@@ -130,4 +111,4 @@ Once the server is up and running, The url is available in the aws-exports.js fi
 https://6dbg37jfw5.execute-api.us-east-1.amazonaws.com/<env-name>/graphql
 ```
 
-You can also use the GraphQL playground by navigating to the GraphQL endpoint `/graphql` directly in your browser.
\ No newline at end of file
+You can also use the GraphQL playground by navigating to the GraphQL endpoint `/graphql` directly in your browser.
diff --git a/src/pages/guides/functions/integrating-dynamodb-with-lambda/q/platform/[platform].mdx b/src/pages/guides/functions/integrating-dynamodb-with-lambda/q/platform/[platform].mdx
index a1ed3510f86..d41a0f52263 100644
--- a/src/pages/guides/functions/integrating-dynamodb-with-lambda/q/platform/[platform].mdx
+++ b/src/pages/guides/functions/integrating-dynamodb-with-lambda/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Integrating DynamoDB with Lambda`,
   description: `How to integrate a DynamoDB table with a Lambda function`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 In this guide you will learn how to do three things:
diff --git a/src/pages/guides/hosting/custom-domains/q/platform/[platform].mdx b/src/pages/guides/hosting/custom-domains/q/platform/[platform].mdx
index 33905c14328..8b8e464448a 100644
--- a/src/pages/guides/hosting/custom-domains/q/platform/[platform].mdx
+++ b/src/pages/guides/hosting/custom-domains/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Custom Domains`,
   description: `How to enable a custom domain name using Amplify hosting`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/hosting/custom-domains.mdx";
diff --git a/src/pages/guides/hosting/gatsby/q/platform/[platform].mdx b/src/pages/guides/hosting/gatsby/q/platform/[platform].mdx
index b1d31418594..5dab7a9c87d 100644
--- a/src/pages/guides/hosting/gatsby/q/platform/[platform].mdx
+++ b/src/pages/guides/hosting/gatsby/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Gatsby`,
   description: `How to deploy a Gatsby site to Amplify Console Hosting`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/hosting/gatsby.mdx";
diff --git a/src/pages/guides/hosting/git-based-deployments/q/platform/[platform].mdx b/src/pages/guides/hosting/git-based-deployments/q/platform/[platform].mdx
index 7a270f04b4e..81a47d0e1e4 100644
--- a/src/pages/guides/hosting/git-based-deployments/q/platform/[platform].mdx
+++ b/src/pages/guides/hosting/git-based-deployments/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Git-based deployments`,
   description: `How to deploy a static site to Amplify hosting using a Git repo`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/hosting/git-based-deployments.mdx";
diff --git a/src/pages/guides/hosting/gridsome/q/platform/[platform].mdx b/src/pages/guides/hosting/gridsome/q/platform/[platform].mdx
index 4884e251ea1..487ed8d87c4 100644
--- a/src/pages/guides/hosting/gridsome/q/platform/[platform].mdx
+++ b/src/pages/guides/hosting/gridsome/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Gridsome`,
   description: `How to deploy a Gridsome site to Amplify Console Hosting`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/hosting/gridsome.mdx";
diff --git a/src/pages/guides/hosting/local-deployments/q/platform/[platform].mdx b/src/pages/guides/hosting/local-deployments/q/platform/[platform].mdx
index 8bd678c9e2b..81f3749f3ca 100644
--- a/src/pages/guides/hosting/local-deployments/q/platform/[platform].mdx
+++ b/src/pages/guides/hosting/local-deployments/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Local deployments`,
   description: `How to deploy a static site to Amplify hosting using a local project`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/hosting/local-deployments.mdx";
diff --git a/src/pages/guides/hosting/nextjs/q/platform/[platform].mdx b/src/pages/guides/hosting/nextjs/q/platform/[platform].mdx
index 2435d88c092..2836d48feee 100644
--- a/src/pages/guides/hosting/nextjs/q/platform/[platform].mdx
+++ b/src/pages/guides/hosting/nextjs/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Next.js`,
   description: `How to deploy a Next.js Site to Amplify Hosting`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/hosting/nextjs.mdx";
diff --git a/src/pages/guides/hosting/nuxt/q/platform/[platform].mdx b/src/pages/guides/hosting/nuxt/q/platform/[platform].mdx
index 52efff0ebab..cf4d948a94d 100644
--- a/src/pages/guides/hosting/nuxt/q/platform/[platform].mdx
+++ b/src/pages/guides/hosting/nuxt/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Nuxt.js`,
   description: `How to deploy a Nuxt site to Amplify Console Hosting`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/hosting/nuxt.mdx";
diff --git a/src/pages/guides/hosting/password-protected-deployments/q/platform/[platform].mdx b/src/pages/guides/hosting/password-protected-deployments/q/platform/[platform].mdx
index 72aca25dc05..5a636b8a18c 100644
--- a/src/pages/guides/hosting/password-protected-deployments/q/platform/[platform].mdx
+++ b/src/pages/guides/hosting/password-protected-deployments/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Password protected deployments`,
   description: `How to enable password-protection for your Amplify web deployments`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/hosting/password-protected-deployments.mdx";
diff --git a/src/pages/guides/hosting/pull-request-previews/q/platform/[platform].mdx b/src/pages/guides/hosting/pull-request-previews/q/platform/[platform].mdx
index 85d527b01d9..c23afc555fe 100644
--- a/src/pages/guides/hosting/pull-request-previews/q/platform/[platform].mdx
+++ b/src/pages/guides/hosting/pull-request-previews/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Pull-request previews`,
   description: `How to enable pull-request previews with Amplify hosting`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/guides/hosting/pull-request-previews.mdx";
diff --git a/src/pages/guides/hosting/vite/q/platform/[platform].mdx b/src/pages/guides/hosting/vite/q/platform/[platform].mdx
index 031146aaf28..92e3b590c87 100644
--- a/src/pages/guides/hosting/vite/q/platform/[platform].mdx
+++ b/src/pages/guides/hosting/vite/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Vite`,
-  description: `How to deploy a Vite site to Amplify Hosting`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `How to deploy a Vite site to Amplify Hosting`
 };
 
 import js0 from '/src/fragments/guides/hosting/vite.mdx';
diff --git a/src/pages/guides/index.mdx b/src/pages/guides/index.mdx
deleted file mode 100644
index 92d8ccd8f4b..00000000000
--- a/src/pages/guides/index.mdx
+++ /dev/null
@@ -1,12 +0,0 @@
-import ChooseFilterPage from '@/components/ChooseFilterPage';
-
-import { PLATFORM_FILTER_OPTIONS } from '@/utils/filter-data.ts';
-
-<ChooseFilterPage
-  directoryPath="/ChooseFilterPage"
-  address="/guides"
-  filterKind="platform"
-  filters={PLATFORM_FILTER_OPTIONS}
-  currentFilter="all"
-  message={`Please select one of the following:`}
-/>
diff --git a/src/pages/guides/q/platform/[platform].mdx b/src/pages/guides/q/platform/[platform].mdx
index f18442ae3a2..2efc82c3551 100644
--- a/src/pages/guides/q/platform/[platform].mdx
+++ b/src/pages/guides/q/platform/[platform].mdx
@@ -2,25 +2,7 @@ export const meta = {
   title: `Guides`,
   description: `The Amplify Command Line Interface (CLI) is a unified toolchain to create, integrate, and manage the AWS cloud services for your app. The CLI is category-based with best practices built in. `,
   disableTOC: `true`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  filterKey: `platform`,
 };
 
 Amplify guides are meant to give you a more in-depth understanding of how to use the Amplify CLI, libraries, and hosting to build out common functionality, end-to-end solutions, and frequently asked for workflows.
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 837d268e018..d1b6ee969e8 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,6 +1,6 @@
 import { Grid } from 'theme-ui';
 import Head from 'next/head';
-import { useEffect, useState } from 'react';
+import { useEffect } from 'react';
 
 import Hero from '../components/Hero';
 import LandingHeroCTA from '../components/LandingHeroCTA';
@@ -28,12 +28,8 @@ const meta = {
 };
 
 const Page = () => {
-  const [isMounted, setIsMounted] = useState(false);
-
   useEffect(() => {
     trackPageVisit();
-
-    setIsMounted(true);
   }, []);
 
   return (
@@ -82,7 +78,7 @@ const Page = () => {
         socialLinks={SOCIAL_LINKS as NavMenuItem[]}
         currentSite={'Docs'}
       />
-      {isMounted ? <SecondaryNav /> : <></>}
+      <SecondaryNav />
       <Hero>
         <h1 className="font-weight-300">Amplify Documentation</h1>
         <p>
diff --git a/src/pages/lib-v1/analytics/autotrack/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/autotrack/q/platform/[platform].mdx
index 4a18e0c698e..4b2a8b6b7a9 100644
--- a/src/pages/lib-v1/analytics/autotrack/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/autotrack/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Automatically track sessions`,
-  description: `The Amplify analytics plugin records when an application opens and closes. This session information can be viewed either from your local computer’s terminal or the AWS Console for Pinpoint.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amplify analytics plugin records when an application opens and closes. This session information can be viewed either from your local computer’s terminal or the AWS Console for Pinpoint.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/analytics/create-custom-plugin/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/create-custom-plugin/q/platform/[platform].mdx
index 3de54235440..5be0eaeeed4 100644
--- a/src/pages/lib-v1/analytics/create-custom-plugin/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/create-custom-plugin/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Create a custom plugin`,
-  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`
 };
diff --git a/src/pages/lib-v1/analytics/enable-disable/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/enable-disable/q/platform/[platform].mdx
index 5bc1703e6c7..dea2fa76031 100644
--- a/src/pages/lib-v1/analytics/enable-disable/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/enable-disable/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Enable/Disable Analytics`,
-  description: `Learn how to enable/disable analytics using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to enable/disable analytics using Amplify.`
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/analytics/escapehatch/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/escapehatch/q/platform/[platform].mdx
index f526deb4b91..7da72864c48 100644
--- a/src/pages/lib-v1/analytics/escapehatch/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/escapehatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
   description: `For advanced use cases where Amplify does not provide the functionality, you can retrieve the escape hatch to access the AWSPinpoint instance.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/analytics/existing-resources/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/existing-resources/q/platform/[platform].mdx
index c835fbadfe0..33cbb778775 100644
--- a/src/pages/lib-v1/analytics/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing AWS resources`,
-  description: `Configure the Amplify Libraries to use existing Amazon Pinpoint resources by referencing them in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Configure the Amplify Libraries to use existing Amazon Pinpoint resources by referencing them in your configuration.`
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/analytics/getting-started/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/getting-started/q/platform/[platform].mdx
index 451ee0432b7..2fc420135c3 100644
--- a/src/pages/lib-v1/analytics/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/analytics/identifyuser/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/identifyuser/q/platform/[platform].mdx
index 167a31df759..f656f188819 100644
--- a/src/pages/lib-v1/analytics/identifyuser/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/identifyuser/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Identify user`,
-  description: `Use the Amplify analytics plugin to inform Pinpoint about your users.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Use the Amplify analytics plugin to inform Pinpoint about your users.`
 };
 
 <!-- TODO Find out how to identify a user with JS and RN -->
diff --git a/src/pages/lib-v1/analytics/personalize/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/personalize/q/platform/[platform].mdx
index d17e8c77211..244b70aa879 100644
--- a/src/pages/lib-v1/analytics/personalize/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/personalize/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Personalized recommendations`,
   description: `Amazon Personalize can create recommendations by using event data, historical data, or a combination of both. The event data can then be used to create recommendations.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/analytics/record/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/record/q/platform/[platform].mdx
index 533a32ddce5..1afbaf1a225 100644
--- a/src/pages/lib-v1/analytics/record/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/record/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Record events`,
-  description: `Learn how to record analytics events using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to record analytics events using Amplify.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/analytics/storing/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/storing/q/platform/[platform].mdx
index fc39da9cb2d..ebf62a4b6a6 100644
--- a/src/pages/lib-v1/analytics/storing/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/storing/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Storing analytics data`,
-  description: `The Amazon Kinesis Firehose analytics provider allows you to send analytics data to an Amazon Kinesis Firehose stream for reliably storing data.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amazon Kinesis Firehose analytics provider allows you to send analytics data to an Amazon Kinesis Firehose stream for reliably storing data.`
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/analytics/streaming/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/streaming/q/platform/[platform].mdx
index 2020e6fc50a..de1ac5b9e6d 100644
--- a/src/pages/lib-v1/analytics/streaming/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/streaming/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Streaming analytics data`,
-  description: `The Amazon Kinesis analytics provider allows you to send analytics data to an Amazon Kinesis stream for real-time processing.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amazon Kinesis analytics provider allows you to send analytics data to an Amazon Kinesis stream for real-time processing.`
 };
diff --git a/src/pages/lib-v1/analytics/update-endpoint/q/platform/[platform].mdx b/src/pages/lib-v1/analytics/update-endpoint/q/platform/[platform].mdx
index 79eb03cf4cd..f64c99cecd6 100644
--- a/src/pages/lib-v1/analytics/update-endpoint/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/analytics/update-endpoint/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Update Endpoint`,
-  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`
 };
diff --git a/src/pages/lib-v1/auth/access_credentials/q/platform/[platform].mdx b/src/pages/lib-v1/auth/access_credentials/q/platform/[platform].mdx
index dac7525ebba..546569d4763 100644
--- a/src/pages/lib-v1/auth/access_credentials/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/access_credentials/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Accessing credentials`,
-  description: `Use AWS Cognito Auth plugin to access auth credentials`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Use AWS Cognito Auth plugin to access auth credentials`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/advanced/q/platform/[platform].mdx b/src/pages/lib-v1/auth/advanced/q/platform/[platform].mdx
index cf7f964f05f..2df545ae41f 100644
--- a/src/pages/lib-v1/auth/advanced/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/advanced/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Advanced workflows`,
   description: `Learn more about advanced workflows in the Amplify auth category. This includes subscribing to events, identity pool federation, auth-related Lambda triggers and working with AWS service objects.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
diff --git a/src/pages/lib-v1/auth/auth-events/q/platform/[platform].mdx b/src/pages/lib-v1/auth/auth-events/q/platform/[platform].mdx
index 156a02118c2..0e6c8f5ba24 100644
--- a/src/pages/lib-v1/auth/auth-events/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/auth-events/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Auth events`,
-  description: `Listen to various auth events`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Listen to various auth events`
 };
 
 AWS Cognito Auth Plugin sends important events through Amplify Hub.
diff --git a/src/pages/lib-v1/auth/customui/q/platform/[platform].mdx b/src/pages/lib-v1/auth/customui/q/platform/[platform].mdx
index 1a63921264b..e7446909025 100644
--- a/src/pages/lib-v1/auth/customui/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/customui/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Customize UI components`,
   description: `Learn how to customize the Amplify auth UI components.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/auth/delete_user/q/platform/[platform].mdx b/src/pages/lib-v1/auth/delete_user/q/platform/[platform].mdx
index 7127b75dcbf..2ea7d7ffbaa 100644
--- a/src/pages/lib-v1/auth/delete_user/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/delete_user/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Delete user`,
-  description: `Delete a user`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Delete a user`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/device_features/q/platform/[platform].mdx b/src/pages/lib-v1/auth/device_features/q/platform/[platform].mdx
index f08ba9b6803..128b45e1d6f 100644
--- a/src/pages/lib-v1/auth/device_features/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/device_features/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Remember a device`,
-  description: `You can use the device related features of Amazon Cognito UserPools by enabling the Devices features. Go to your Cognito UserPool, click on Devices in Left Navigation Menu and chose one of User Opt In or Always.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `You can use the device related features of Amazon Cognito UserPools by enabling the Devices features. Go to your Cognito UserPool, click on Devices in Left Navigation Menu and chose one of User Opt In or Always.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/emailpassword/q/platform/[platform].mdx b/src/pages/lib-v1/auth/emailpassword/q/platform/[platform].mdx
index dd7bf20bb7b..dea6972012f 100644
--- a/src/pages/lib-v1/auth/emailpassword/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/emailpassword/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Sign up, Sign in & Sign out`,
   description: `Learn how to use Amplify's sign up, sign in and sign out APIs.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/auth/escapehatch/q/platform/[platform].mdx b/src/pages/lib-v1/auth/escapehatch/q/platform/[platform].mdx
index 230b2863fef..421e355b9b8 100644
--- a/src/pages/lib-v1/auth/escapehatch/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/escapehatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
   description: `Underlying service`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/existing-resources/q/platform/[platform].mdx b/src/pages/lib-v1/auth/existing-resources/q/platform/[platform].mdx
index 97891018a91..718c06ec7ec 100644
--- a/src/pages/lib-v1/auth/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing Amazon Cognito resources`,
   description: `Configure the Amplify Libraries to use existing Amazon Cognito resources by referencing them in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/getting-started/q/platform/[platform].mdx b/src/pages/lib-v1/auth/getting-started/q/platform/[platform].mdx
index 071650eeb03..354d6add84e 100644
--- a/src/pages/lib-v1/auth/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `Amplify uses Amazon Cognito as the main authentication provider. Learn how to handle user registration, authentication, account recovery & other operations.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Amplify uses Amazon Cognito as the main authentication provider. Learn how to handle user registration, authentication, account recovery & other operations.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/guest_access/q/platform/[platform].mdx b/src/pages/lib-v1/auth/guest_access/q/platform/[platform].mdx
index a7f48122aeb..04c1e10c088 100644
--- a/src/pages/lib-v1/auth/guest_access/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/guest_access/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Guest access`,
-  description: `Access services without needing to sign in.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Access services without needing to sign in.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/manageusers/q/platform/[platform].mdx b/src/pages/lib-v1/auth/manageusers/q/platform/[platform].mdx
index f24e701a9e6..2082719ba42 100644
--- a/src/pages/lib-v1/auth/manageusers/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/manageusers/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Password & user management`,
   description: `Learn more about how to handle common password and user management scenarios. E.g. password reset, account recovery etc.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/auth/managing_credentials/q/platform/[platform].mdx b/src/pages/lib-v1/auth/managing_credentials/q/platform/[platform].mdx
index 64f150c1fbf..d699138bb98 100644
--- a/src/pages/lib-v1/auth/managing_credentials/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/managing_credentials/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Managing credentials`,
-  description: `Learn how to customize credential storage.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to customize credential storage.`
 };
 
 import flutter_maintenance from '/src/fragments/lib-v1/flutter-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/mfa/q/platform/[platform].mdx b/src/pages/lib-v1/auth/mfa/q/platform/[platform].mdx
index 8d025d2060b..2ba6d6d7732 100644
--- a/src/pages/lib-v1/auth/mfa/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/mfa/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Multi-factor authentication`,
   description: `Learn how to enable multi-factor authentication with Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/auth/overview/q/platform/[platform].mdx b/src/pages/lib-v1/auth/overview/q/platform/[platform].mdx
index 3e444b4f77b..71e98cd497b 100644
--- a/src/pages/lib-v1/auth/overview/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/overview/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Under the hood`,
   description: `Learn more about the foundational auth concepts for cloud-based application and how they work with Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/password_management/q/platform/[platform].mdx b/src/pages/lib-v1/auth/password_management/q/platform/[platform].mdx
index c14abfff807..de34e910913 100644
--- a/src/pages/lib-v1/auth/password_management/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/password_management/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Password management`,
-  description: `Use AWS Cognito Auth plugin to update or reset user password`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Use AWS Cognito Auth plugin to update or reset user password`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/signOut/q/platform/[platform].mdx b/src/pages/lib-v1/auth/signOut/q/platform/[platform].mdx
index a1981257de5..cecf9e2563b 100644
--- a/src/pages/lib-v1/auth/signOut/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/signOut/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Sign out`,
-  description: `SignOut a user`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `SignOut a user`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/signin/q/platform/[platform].mdx b/src/pages/lib-v1/auth/signin/q/platform/[platform].mdx
index 6a8685f2ae0..2c5c78d6e96 100644
--- a/src/pages/lib-v1/auth/signin/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/signin/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Sign in`,
-  description: `Use AWS Cognito Auth plugin to sign in a user into AWS Cognito User Pool`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Use AWS Cognito Auth plugin to sign in a user into AWS Cognito User Pool`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/signin_next_steps/q/platform/[platform].mdx b/src/pages/lib-v1/auth/signin_next_steps/q/platform/[platform].mdx
index c55ba067cf6..562ee65fbfe 100644
--- a/src/pages/lib-v1/auth/signin_next_steps/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/signin_next_steps/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Sign in next steps`,
   description: `Use AWS Cognito Auth plugin to complete a multi step authentication flow`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/signin_web_ui/q/platform/[platform].mdx b/src/pages/lib-v1/auth/signin_web_ui/q/platform/[platform].mdx
index 10b6d30e6a7..d781d499340 100644
--- a/src/pages/lib-v1/auth/signin_web_ui/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/signin_web_ui/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Sign in with web UI`,
-  description: `Use AWS Cognito Auth plugin to register and authenticate a user with a prebuilt web UI`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Use AWS Cognito Auth plugin to register and authenticate a user with a prebuilt web UI`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/signin_with_custom_flow/q/platform/[platform].mdx b/src/pages/lib-v1/auth/signin_with_custom_flow/q/platform/[platform].mdx
index 15c697f8454..ca0975bc9f5 100644
--- a/src/pages/lib-v1/auth/signin_with_custom_flow/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/signin_with_custom_flow/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Sign in with custom flow`,
-  description: `Use AWS Cognito Auth plugin to sign in a user into AWS Cognito User Pool using user defined custom flow`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Use AWS Cognito Auth plugin to sign in a user into AWS Cognito User Pool using user defined custom flow`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/sms_flows/q/platform/[platform].mdx b/src/pages/lib-v1/auth/sms_flows/q/platform/[platform].mdx
index 6f319e88ae7..a076bb67ebe 100644
--- a/src/pages/lib-v1/auth/sms_flows/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/sms_flows/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `SMS flows`,
-  description: `Using phone numbers for sign-in and verification`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Using phone numbers for sign-in and verification`
 };
 
 import flutter_maintenance from '/src/fragments/lib-v1/flutter-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/social/q/platform/[platform].mdx b/src/pages/lib-v1/auth/social/q/platform/[platform].mdx
index dfe047958d7..cca980f7699 100644
--- a/src/pages/lib-v1/auth/social/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/social/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Social sign-in (OAuth)`,
-  description: `Learn how to setup social sign-in providers like Facebook, Google, Amazon, or Sign in with Apple.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to setup social sign-in providers like Facebook, Google, Amazon, or Sign in with Apple.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/auth/start/q/platform/[platform].mdx b/src/pages/lib-v1/auth/start/q/platform/[platform].mdx
index 36a6b63923e..07468ff6b10 100644
--- a/src/pages/lib-v1/auth/start/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/start/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Create or re-use existing backend`,
   description: `Learn more about how to create an auth resource or re-use an existing auth backend for Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
diff --git a/src/pages/lib-v1/auth/switch-auth/q/platform/[platform].mdx b/src/pages/lib-v1/auth/switch-auth/q/platform/[platform].mdx
index ec2914814a5..4984fc43e34 100644
--- a/src/pages/lib-v1/auth/switch-auth/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/switch-auth/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Switching authentication flows`,
   description: `Learn more about how to switch between different auth flows in Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/auth/user-attributes/q/platform/[platform].mdx b/src/pages/lib-v1/auth/user-attributes/q/platform/[platform].mdx
index bcd4ab34d4f..90a65c59b92 100644
--- a/src/pages/lib-v1/auth/user-attributes/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/auth/user-attributes/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `User attributes`,
-  description: `Access and update user attributes`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Access and update user attributes`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/advanced-workflows/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/advanced-workflows/q/platform/[platform].mdx
index e193f774c08..2aacfda834a 100644
--- a/src/pages/lib-v1/datastore/advanced-workflows/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/advanced-workflows/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Advanced workflows`,
-  description: `Learn more about advanced workflows in the Amplify DataStore category, including custom primary keys.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about advanced workflows in the Amplify DataStore category, including custom primary keys.`
 };
 
 import flutter_maintenance from '/src/fragments/lib-v1/flutter-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/auth-model/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/auth-model/q/platform/[platform].mdx
index a8f5fb10bb7..17766c0fa1f 100644
--- a/src/pages/lib-v1/datastore/auth-model/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/auth-model/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Models with authorization`,
   description: `Learn more about how DataStore handles Models with finer grain authorization access checks.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/conflict/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/conflict/q/platform/[platform].mdx
index 3faa3eebc43..0bbb6bc2eba 100644
--- a/src/pages/lib-v1/datastore/conflict/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/conflict/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Conflict resolution`,
-  description: `Learn more about how conflict resolution in DataStore is managed and how to configure it.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how conflict resolution in DataStore is managed and how to configure it.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/data-access/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/data-access/q/platform/[platform].mdx
index 46e444c7b92..f239c27fa98 100644
--- a/src/pages/lib-v1/datastore/data-access/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/data-access/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Manipulating data`,
-  description: `Learn how to save, query, paginate, update, delete and observe data in DataStore.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to save, query, paginate, update, delete and observe data in DataStore.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/datastore-events/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/datastore-events/q/platform/[platform].mdx
index c2e7da6b12e..19c8598b38b 100644
--- a/src/pages/lib-v1/datastore/datastore-events/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/datastore-events/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `DataStore Events`,
-  description: `Listening to DataStore events`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Listening to DataStore events`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/examples/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/examples/q/platform/[platform].mdx
index 1bd4f9a8a4c..b9f46f1b958 100644
--- a/src/pages/lib-v1/datastore/examples/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/examples/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Examples`,
   description: `Full examples and resources using Amplify DataStore.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/datastore/getting-started/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/getting-started/q/platform/[platform].mdx
index 7dcd771facf..dbdf0eaab4f 100644
--- a/src/pages/lib-v1/datastore/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `Amplify DataStore provides a programming model for leveraging shared and distributed data without writing additional code for offline and online scenarios, which makes working with distributed, cross-user data just as simple as working with local-only data.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Amplify DataStore provides a programming model for leveraging shared and distributed data without writing additional code for offline and online scenarios, which makes working with distributed, cross-user data just as simple as working with local-only data.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/how-it-works/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/how-it-works/q/platform/[platform].mdx
index 45789f96c5e..80b7e29e625 100644
--- a/src/pages/lib-v1/datastore/how-it-works/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/how-it-works/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `How it works`,
-  description: `Amplify DataStore provides a persistent on-device storage repository for you to write, read, and observe changes to data if you are online or offline, and seamlessly sync to the cloud as well as across devices. Learn more about how it works.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Amplify DataStore provides a persistent on-device storage repository for you to write, read, and observe changes to data if you are online or offline, and seamlessly sync to the cloud as well as across devices. Learn more about how it works.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/other-methods/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/other-methods/q/platform/[platform].mdx
index 0ba221305ea..2930e39b4a7 100644
--- a/src/pages/lib-v1/datastore/other-methods/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/other-methods/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Other methods`,
-  description: `Other Amplify DataStore methods`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Other Amplify DataStore methods`
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/real-time/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/real-time/q/platform/[platform].mdx
index 934f291ab32..a60b0813c7d 100644
--- a/src/pages/lib-v1/datastore/real-time/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/real-time/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Real time`,
-  description: `Learn more about how DataStore handles data changes in real-time.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how DataStore handles data changes in real-time.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/relational/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/relational/q/platform/[platform].mdx
index f57acf765be..c4ac34f3bca 100644
--- a/src/pages/lib-v1/datastore/relational/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/relational/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Relational models`,
-  description: `Learn more about how DataStore handles relationships between Models, such as "has one", "has many", "belongs to".`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how DataStore handles relationships between Models, such as "has one", "has many", "belongs to".`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/schema-updates/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/schema-updates/q/platform/[platform].mdx
index 54e8cc1b8a2..e529cfc21ea 100644
--- a/src/pages/lib-v1/datastore/schema-updates/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/schema-updates/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Schema updates`,
-  description: `Learn more about how to issue schema updates for DataStore`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to issue schema updates for DataStore`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/setup-auth-rules/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/setup-auth-rules/q/platform/[platform].mdx
index fc960fc0265..2d9377255d1 100644
--- a/src/pages/lib-v1/datastore/setup-auth-rules/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/setup-auth-rules/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Setup authorization rules`,
-  description: `Learn how to apply authorization rules to your models with the @auth directive`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to apply authorization rules to your models with the @auth directive`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/datastore/sync/q/platform/[platform].mdx b/src/pages/lib-v1/datastore/sync/q/platform/[platform].mdx
index a26c4386e85..865b92ba627 100644
--- a/src/pages/lib-v1/datastore/sync/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/datastore/sync/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Syncing data to cloud`,
-  description: `Learn more about how DataStore connects to an AppSync backend and automatically syncs all locally saved data using GraphQL.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how DataStore connects to an AppSync backend and automatically syncs all locally saved data using GraphQL.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/debugging/dev-menu/q/platform/[platform].mdx b/src/pages/lib-v1/debugging/dev-menu/q/platform/[platform].mdx
index dccc5a117b8..e4afb5b978d 100644
--- a/src/pages/lib-v1/debugging/dev-menu/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/debugging/dev-menu/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Developer Menu`,
   description: `Amplify developer menu helps you quickly file GitHub issues with critical information (environment and device information) automatically added to the issue description. Learn how to setup, activate, and use the developer menu.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/geo/escapehatch/q/platform/[platform].mdx b/src/pages/lib-v1/geo/escapehatch/q/platform/[platform].mdx
index 6fbe2f1e8c7..d3fec5a09ed 100644
--- a/src/pages/lib-v1/geo/escapehatch/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/geo/escapehatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
   description: `For specialized use cases where Amplify does not provide the functionality, you can use the escape hatch to access a low-level client instance for Amazon Location Service.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/geo/existing-resources/q/platform/[platform].mdx b/src/pages/lib-v1/geo/existing-resources/q/platform/[platform].mdx
index 83f6339d692..9a54cf1396a 100644
--- a/src/pages/lib-v1/geo/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/geo/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing Amazon Location Service resources`,
   description: `Configure Amplify Geo to use existing Amazon Location Service resources by referencing them in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/geo/geofences/q/platform/[platform].mdx b/src/pages/lib-v1/geo/geofences/q/platform/[platform].mdx
index 3c22cdc44c7..0ab587f6f6a 100644
--- a/src/pages/lib-v1/geo/geofences/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/geo/geofences/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Geofences`,
-  description: `The Amplify Geo category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amplify Geo category`
 };
diff --git a/src/pages/lib-v1/geo/getting-started/q/platform/[platform].mdx b/src/pages/lib-v1/geo/getting-started/q/platform/[platform].mdx
index c5cf0665e35..8086dcd10a2 100644
--- a/src/pages/lib-v1/geo/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/geo/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
   description: `AWS Amplify Geo module provides a simple way to get map data, search for places, and reverse geocoding.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/geo/google-migration/q/platform/[platform].mdx b/src/pages/lib-v1/geo/google-migration/q/platform/[platform].mdx
index e6ca3aa510e..bb6bf18c4bc 100644
--- a/src/pages/lib-v1/geo/google-migration/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/geo/google-migration/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Migrating from Google Maps`,
-  description: `Migrate applications from Google Maps to Amplify Geo`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Migrate applications from Google Maps to Amplify Geo`
 };
diff --git a/src/pages/lib-v1/geo/maps/q/platform/[platform].mdx b/src/pages/lib-v1/geo/maps/q/platform/[platform].mdx
index 0aab70822d2..243e04210fe 100644
--- a/src/pages/lib-v1/geo/maps/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/geo/maps/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Maps`,
   description: `The Amplify Geo category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/geo/search/q/platform/[platform].mdx b/src/pages/lib-v1/geo/search/q/platform/[platform].mdx
index c9be79f87d5..e6e9bb616f1 100644
--- a/src/pages/lib-v1/geo/search/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/geo/search/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Location Search`,
   description: `The Amplify Geo category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/graphqlapi/advanced-workflows/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/advanced-workflows/q/platform/[platform].mdx
index 80bb54743e3..8f980d5057c 100644
--- a/src/pages/lib-v1/graphqlapi/advanced-workflows/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/advanced-workflows/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Advanced Workflows`,
-  description: `Learn more about advanced workflows in Amplify's API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about advanced workflows in Amplify's API category`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/graphqlapi/authz/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/authz/q/platform/[platform].mdx
index 17d21bf8082..2a2d6cf7a90 100644
--- a/src/pages/lib-v1/graphqlapi/authz/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/authz/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Configure authorization modes`,
-  description: `Learn more about how to configure authorization modes in Amplify's API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to configure authorization modes in Amplify's API category`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/graphqlapi/cancel-request/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/cancel-request/q/platform/[platform].mdx
index 0ebec8a732d..93971bf199c 100644
--- a/src/pages/lib-v1/graphqlapi/cancel-request/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/cancel-request/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Cancel API requests`,
   description: `Learn more about how to cancel query or mutation requests with Amplify's GraphQL API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
diff --git a/src/pages/lib-v1/graphqlapi/concepts/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/concepts/q/platform/[platform].mdx
index c4e5277ea08..025a7de4001 100644
--- a/src/pages/lib-v1/graphqlapi/concepts/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/concepts/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Concepts`,
-  description: `Learn more about the foundation concepts of Amplify's API category.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about the foundation concepts of Amplify's API category.`
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/graphqlapi/create-or-re-use-existing-backend/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/create-or-re-use-existing-backend/q/platform/[platform].mdx
index e568e900493..659ba09a1b2 100644
--- a/src/pages/lib-v1/graphqlapi/create-or-re-use-existing-backend/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/create-or-re-use-existing-backend/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Create or re-use existing backend`,
   description: `Learn more about how to create or re-use an existing API backend resource in Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
diff --git a/src/pages/lib-v1/graphqlapi/existing-resources/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/existing-resources/q/platform/[platform].mdx
index 0cac40b4415..441570a15a1 100644
--- a/src/pages/lib-v1/graphqlapi/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing AWS resources`,
-  description: `Configure the Amplify Libraries to use existing AWS AppSync resources by referencing them in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Configure the Amplify Libraries to use existing AWS AppSync resources by referencing them in your configuration.`
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/graphqlapi/getting-started/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/getting-started/q/platform/[platform].mdx
index c0bc774dc8a..7f56f73801e 100644
--- a/src/pages/lib-v1/graphqlapi/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `Learn more about how to get started with Amplify's API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to get started with Amplify's API category`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/graphqlapi/graphql-from-nodejs/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/graphql-from-nodejs/q/platform/[platform].mdx
index 985b4bfdc79..c72fb115f56 100644
--- a/src/pages/lib-v1/graphqlapi/graphql-from-nodejs/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/graphql-from-nodejs/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `GraphQL from NodeJS`,
   description: `Learn more about how to call an AppSync GraphQL API from a NodeJS app or a Lambda function`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
diff --git a/src/pages/lib-v1/graphqlapi/mutate-data/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/mutate-data/q/platform/[platform].mdx
index d814a58a166..2ad17196af5 100644
--- a/src/pages/lib-v1/graphqlapi/mutate-data/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/mutate-data/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Create, update, delete data`,
-  description: `Learn more about how to create and update data using GraphQL APIs in Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to create and update data using GraphQL APIs in Amplify`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/graphqlapi/offline/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/offline/q/platform/[platform].mdx
index bc24cd4495e..918394333c3 100644
--- a/src/pages/lib-v1/graphqlapi/offline/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/offline/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Offline scenarios`,
-  description: `Learn more about how to support offline scenarios with Amplify's GraphQL API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to support offline scenarios with Amplify's GraphQL API category`
 };
 
 import flutter_maintenance from '/src/fragments/lib-v1/flutter-maintenance.mdx';
diff --git a/src/pages/lib-v1/graphqlapi/query-data/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/query-data/q/platform/[platform].mdx
index 7d1b8a8309b..51785ad0c36 100644
--- a/src/pages/lib-v1/graphqlapi/query-data/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/query-data/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Fetch data`,
-  description: `Learn more about how to fetch data using Amplify's GraphQL API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to fetch data using Amplify's GraphQL API category`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/graphqlapi/subscribe-data/q/platform/[platform].mdx b/src/pages/lib-v1/graphqlapi/subscribe-data/q/platform/[platform].mdx
index 7eebea8f67c..6bd7489e0df 100644
--- a/src/pages/lib-v1/graphqlapi/subscribe-data/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/graphqlapi/subscribe-data/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Subscribe to data`,
-  description: `Learn more about how to observe to data changes using subscriptions in Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to observe to data changes using subscriptions in Amplify.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/index.mdx b/src/pages/lib-v1/index.mdx
deleted file mode 100644
index 6db8b6eb3fb..00000000000
--- a/src/pages/lib-v1/index.mdx
+++ /dev/null
@@ -1,12 +0,0 @@
-import ChooseFilterPage from '@/components/ChooseFilterPage';
-
-import { PLATFORM_FILTER_OPTIONS } from '@/utils/filter-data.ts';
-
-<ChooseFilterPage
-  directoryPath="/ChooseFilterPage"
-  address="/lib-v1"
-  filterKind="platform"
-  filters={PLATFORM_FILTER_OPTIONS}
-  currentFilter="all"
-  message={`Please select one of the following:`}
-/>
diff --git a/src/pages/lib-v1/info/app-uninstall/q/platform/[platform].mdx b/src/pages/lib-v1/info/app-uninstall/q/platform/[platform].mdx
index cce4e20605a..184f6e51080 100644
--- a/src/pages/lib-v1/info/app-uninstall/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/info/app-uninstall/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Uninstalling the app`,
   description: `Learn about the data that gets stored persistently on a device.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/info/overview/q/platform/[platform].mdx b/src/pages/lib-v1/info/overview/q/platform/[platform].mdx
index be949277c91..c8395747263 100644
--- a/src/pages/lib-v1/info/overview/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/info/overview/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Data Information`,
   description: `Information regarding the data collected by the library`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/interactions/chatbot/q/platform/[platform].mdx b/src/pages/lib-v1/interactions/chatbot/q/platform/[platform].mdx
new file mode 100644
index 00000000000..9692f17382b
--- /dev/null
+++ b/src/pages/lib-v1/interactions/chatbot/q/platform/[platform].mdx
@@ -0,0 +1,4 @@
+export const meta = {
+  title: `Interact with bots`,
+  description: `Learn more about how to integrate chat bot interactions into your application using Amplify.`,
+};
\ No newline at end of file
diff --git a/src/pages/lib-v1/predictions/escapehatch/q/platform/[platform].mdx b/src/pages/lib-v1/predictions/escapehatch/q/platform/[platform].mdx
index 1ef46ec9e66..e4c50613811 100644
--- a/src/pages/lib-v1/predictions/escapehatch/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/predictions/escapehatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
   description: `For any of the AWS services behind predictions, you can use the SDK object to get access to any methods we are not calling on your behalf by using an escape hatch.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/predictions/getting-started/q/platform/[platform].mdx b/src/pages/lib-v1/predictions/getting-started/q/platform/[platform].mdx
index 38fedb70a2b..6d3a03c24e1 100644
--- a/src/pages/lib-v1/predictions/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/predictions/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
   description: `Get started with integrating ML capabilities into your application using Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/predictions/identify-entity/q/platform/[platform].mdx b/src/pages/lib-v1/predictions/identify-entity/q/platform/[platform].mdx
index 32b7909811b..5e3b3cd9ac4 100644
--- a/src/pages/lib-v1/predictions/identify-entity/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/predictions/identify-entity/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Identify entities from images`,
   description: `Learn more about how to identify entities from an image using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/predictions/identify-text/q/platform/[platform].mdx b/src/pages/lib-v1/predictions/identify-text/q/platform/[platform].mdx
index 3d0130849da..978e812a4c6 100644
--- a/src/pages/lib-v1/predictions/identify-text/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/predictions/identify-text/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Identify text`,
   description: `Learn more about how to identify text from images and documents in your application using AWS Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/predictions/interpret/q/platform/[platform].mdx b/src/pages/lib-v1/predictions/interpret/q/platform/[platform].mdx
index 8dc899410fe..631d88315b9 100644
--- a/src/pages/lib-v1/predictions/interpret/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/predictions/interpret/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Interpret sentiment`,
   description: `Learn more about how to determine key phrases, sentiment, language, syntax, and entities from text using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/predictions/intro/q/platform/[platform].mdx b/src/pages/lib-v1/predictions/intro/q/platform/[platform].mdx
index 4cca8cbb275..f4041b8ea28 100644
--- a/src/pages/lib-v1/predictions/intro/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/predictions/intro/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Overview`,
   description: `The Predictions category enables you to integrate machine learning in your application without any prior machine learning experience. The Predictions category comes with built-in support for both online and offline use cases.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
diff --git a/src/pages/lib-v1/predictions/label-image/q/platform/[platform].mdx b/src/pages/lib-v1/predictions/label-image/q/platform/[platform].mdx
index 7a868b8c1fd..0988b3cfe0a 100644
--- a/src/pages/lib-v1/predictions/label-image/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/predictions/label-image/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Label objects in image`,
   description: `Learn more about how to detect labels in an image using Amplify. For example you can detect if an image has objects such as chairs, desks etc.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/predictions/sample/q/platform/[platform].mdx b/src/pages/lib-v1/predictions/sample/q/platform/[platform].mdx
index c5fb3a8cdc7..2808d193af4 100644
--- a/src/pages/lib-v1/predictions/sample/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/predictions/sample/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Example`,
   description: `Sample code for Amplify's predictions category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
diff --git a/src/pages/lib-v1/predictions/text-speech/q/platform/[platform].mdx b/src/pages/lib-v1/predictions/text-speech/q/platform/[platform].mdx
index eb50e726c5d..caae3991e02 100644
--- a/src/pages/lib-v1/predictions/text-speech/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/predictions/text-speech/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Text to speech`,
   description: `Learn more about how to integrate text-to-speech capabilities into your application using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/predictions/transcribe/q/platform/[platform].mdx b/src/pages/lib-v1/predictions/transcribe/q/platform/[platform].mdx
index f36a62c116c..73fd0d0b83e 100644
--- a/src/pages/lib-v1/predictions/transcribe/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/predictions/transcribe/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Transcribe audio to text`,
   description: `Learn more about how to transcribe audio to text (also known as speech-to-text) for your application using Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/predictions/translate/q/platform/[platform].mdx b/src/pages/lib-v1/predictions/translate/q/platform/[platform].mdx
index cb60ea9ce6c..def89c37cbe 100644
--- a/src/pages/lib-v1/predictions/translate/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/predictions/translate/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Translate language`,
   description: `Learn more about how to integrate translation capabilities for your application using Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/project-setup/async/q/platform/[platform].mdx b/src/pages/lib-v1/project-setup/async/q/platform/[platform].mdx
index 886119213e4..caca6de1c48 100644
--- a/src/pages/lib-v1/project-setup/async/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/project-setup/async/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Async Programming Model`,
   description: `Amplify Android uses an asynchronous programming model`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/project-setup/combine/q/platform/[platform].mdx b/src/pages/lib-v1/project-setup/combine/q/platform/[platform].mdx
index a5890cd45c8..0e76549274b 100644
--- a/src/pages/lib-v1/project-setup/combine/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/project-setup/combine/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Using Combine with Amplify`,
   description: `Amplify's support for Apple's Combine framework`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/project-setup/coroutines/q/platform/[platform].mdx b/src/pages/lib-v1/project-setup/coroutines/q/platform/[platform].mdx
index f3dd9dc3fb0..02e9151c6a6 100644
--- a/src/pages/lib-v1/project-setup/coroutines/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/project-setup/coroutines/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Kotlin Coroutines Support`,
   description: `Amplify Android includes first-class support for Kotlin Coroutines and Flows.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/project-setup/create-application/q/platform/[platform].mdx b/src/pages/lib-v1/project-setup/create-application/q/platform/[platform].mdx
index 754ca77decf..5e4663e901d 100644
--- a/src/pages/lib-v1/project-setup/create-application/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/project-setup/create-application/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Create your application`,
-  description: `Project setup for Amplify prior to adding category specific example.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Project setup for Amplify prior to adding category specific example.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/project-setup/escape-hatch/q/platform/[platform].mdx b/src/pages/lib-v1/project-setup/escape-hatch/q/platform/[platform].mdx
index 60e640b64bb..4ac2280c823 100644
--- a/src/pages/lib-v1/project-setup/escape-hatch/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/project-setup/escape-hatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
-  description: `Advanced use cases in Amplify Flutter`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Advanced use cases in Amplify Flutter`
 };
 
 import flutter_maintenance from '/src/fragments/lib-v1/flutter-maintenance.mdx';
diff --git a/src/pages/lib-v1/project-setup/null-safety/q/platform/[platform].mdx b/src/pages/lib-v1/project-setup/null-safety/q/platform/[platform].mdx
index 2258e63c113..f1909f2450b 100644
--- a/src/pages/lib-v1/project-setup/null-safety/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/project-setup/null-safety/q/platform/[platform].mdx
@@ -1,24 +1,5 @@
 export const meta = {
   title: `Null safety`,
   description: `Using Dart null safety with amplify-flutter`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
diff --git a/src/pages/lib-v1/project-setup/platform-setup/q/platform/[platform].mdx b/src/pages/lib-v1/project-setup/platform-setup/q/platform/[platform].mdx
index db766f5ba29..f0a76f6ae86 100644
--- a/src/pages/lib-v1/project-setup/platform-setup/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/project-setup/platform-setup/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Platform Setup`,
-  description: `Instructions for platform-specific configurations needed for amplify-flutter`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Instructions for platform-specific configurations needed for amplify-flutter`
 };
 
 import flutter_maintenance from '/src/fragments/lib-v1/flutter-maintenance.mdx';
diff --git a/src/pages/lib-v1/project-setup/prereq/q/platform/[platform].mdx b/src/pages/lib-v1/project-setup/prereq/q/platform/[platform].mdx
index 6fce507e463..68910104375 100644
--- a/src/pages/lib-v1/project-setup/prereq/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/project-setup/prereq/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Prerequisites`,
-  description: `Project Setup with Amplify - Prerequisites`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Project Setup with Amplify - Prerequisites`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/project-setup/rxjava/q/platform/[platform].mdx b/src/pages/lib-v1/project-setup/rxjava/q/platform/[platform].mdx
index 0425930bd4d..9b10c56b91e 100644
--- a/src/pages/lib-v1/project-setup/rxjava/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/project-setup/rxjava/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Using RxJava with Amplify`,
   description: `Amplify Android has first-class support for Reactive Extensions / RxJava.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/project-setup/use-existing-resources/q/platform/[platform].mdx b/src/pages/lib-v1/project-setup/use-existing-resources/q/platform/[platform].mdx
index 910adb65760..60f7d5b897e 100644
--- a/src/pages/lib-v1/project-setup/use-existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/project-setup/use-existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing AWS resources`,
   description: `Add existing AWS resources to an application without the CLI.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/push-notifications/getting-started/q/platform/[platform].mdx b/src/pages/lib-v1/push-notifications/getting-started/q/platform/[platform].mdx
new file mode 100644
index 00000000000..08b08e60de9
--- /dev/null
+++ b/src/pages/lib-v1/push-notifications/getting-started/q/platform/[platform].mdx
@@ -0,0 +1,4 @@
+export const meta = {
+  title: `Getting started`,
+  description: `Use of Push Notifications of Amplify`,
+};
diff --git a/src/pages/lib-v1/push-notifications/working-with-api/q/platform/[platform].mdx b/src/pages/lib-v1/push-notifications/working-with-api/q/platform/[platform].mdx
new file mode 100644
index 00000000000..7542eccfdb5
--- /dev/null
+++ b/src/pages/lib-v1/push-notifications/working-with-api/q/platform/[platform].mdx
@@ -0,0 +1,4 @@
+export const meta = {
+  title: `Working with API`,
+  description: `Breakdown of using the Push Notifications API in Amplify`,
+};
diff --git a/src/pages/lib-v1/q/platform/[platform].mdx b/src/pages/lib-v1/q/platform/[platform].mdx
index aba4dae3bee..4a01bc7534b 100644
--- a/src/pages/lib-v1/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/q/platform/[platform].mdx
@@ -3,25 +3,7 @@ export const meta = {
   description:
     'The Amplify open-source client libraries provide use-case centric, opinionated, declarative, and easy-to-use interfaces across different categories of cloud powered operations enabling mobile and web developers to easily interact with their backends. ',
   disableTOC: 'true',
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  filterKey: 'platform'
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
@@ -36,7 +18,9 @@ import flutter_maintenance from '/src/fragments/lib-v1/flutter-maintenance.mdx';
 
 <Fragments fragments={{ flutter: flutter_maintenance }} />
 
+<InlineFilter filters={["ios", "android", "flutter"]}>
 The Amplify open-source client libraries provide use-case centric, and easy-to-use interfaces across different categories of cloud powered operations enabling mobile and web developers to easily interact with their backends. These libraries are powered by the AWS cloud. The libraries can be used with both new backends created using the Amplify CLI and existing backend resources.
+</InlineFilter>
 
 import ios0 from '/src/fragments/lib-v1/ios.mdx';
 
diff --git a/src/pages/lib-v1/restapi/authz/q/platform/[platform].mdx b/src/pages/lib-v1/restapi/authz/q/platform/[platform].mdx
index ef37341022b..d4b7b4cae3b 100644
--- a/src/pages/lib-v1/restapi/authz/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/restapi/authz/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Define authorization rules`,
-  description: `Learn more about how to define authorization rules for Amplify's REST API capabilities`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to define authorization rules for Amplify's REST API capabilities`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/restapi/cancel/q/platform/[platform].mdx b/src/pages/lib-v1/restapi/cancel/q/platform/[platform].mdx
index e64577eab0c..c17f6c4cdfb 100644
--- a/src/pages/lib-v1/restapi/cancel/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/restapi/cancel/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Cancel API requests`,
   description: `Using the Cancel API in Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
diff --git a/src/pages/lib-v1/restapi/delete/q/platform/[platform].mdx b/src/pages/lib-v1/restapi/delete/q/platform/[platform].mdx
index 61a7180bfd5..505239fc5b4 100644
--- a/src/pages/lib-v1/restapi/delete/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/restapi/delete/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Deleting data`,
-  description: `Using the Delete API REST in Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Using the Delete API REST in Amplify`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/restapi/existing-resources/q/platform/[platform].mdx b/src/pages/lib-v1/restapi/existing-resources/q/platform/[platform].mdx
index d87d7492b6e..d3f8e59beb2 100644
--- a/src/pages/lib-v1/restapi/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/restapi/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing AWS resources`,
-  description: `Configure the Amplify Libraries to use existing Amazon API Gateway resources by referencing them in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Configure the Amplify Libraries to use existing Amazon API Gateway resources by referencing them in your configuration.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/restapi/fetch/q/platform/[platform].mdx b/src/pages/lib-v1/restapi/fetch/q/platform/[platform].mdx
index c431e354bb1..c8b1249789a 100644
--- a/src/pages/lib-v1/restapi/fetch/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/restapi/fetch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Fetching data`,
-  description: `Using the GET API REST in Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Using the GET API REST in Amplify`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/restapi/getting-started/q/platform/[platform].mdx b/src/pages/lib-v1/restapi/getting-started/q/platform/[platform].mdx
index 1356135655d..ac32f300094 100644
--- a/src/pages/lib-v1/restapi/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/restapi/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `The API category provides a solution for making HTTP requests to REST and GraphQL endpoints. The REST API category can be used for creating signed requests against Amazon API Gateway when the API Gateway Authorization is set to AWS_IAM.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The API category provides a solution for making HTTP requests to REST and GraphQL endpoints. The REST API category can be used for creating signed requests against Amazon API Gateway when the API Gateway Authorization is set to AWS_IAM.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/restapi/update/q/platform/[platform].mdx b/src/pages/lib-v1/restapi/update/q/platform/[platform].mdx
index fb672c27a94..d89d5326e5e 100644
--- a/src/pages/lib-v1/restapi/update/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/restapi/update/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Updating data`,
-  description: `Using Post, Put, etc. in Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Using Post, Put, etc. in Amplify`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/storage/autotrack/q/platform/[platform].mdx b/src/pages/lib-v1/storage/autotrack/q/platform/[platform].mdx
index 354d9f22c46..b7f63bc3f4a 100644
--- a/src/pages/lib-v1/storage/autotrack/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/autotrack/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Automatically track events`,
   description: `You can enable automatic tracking of Storage Events such as uploads and downloads. Enabling this will automatically send Storage Events to Amazon Pinpoint and you will be able to see them within the AWS Pinpoint Console under Custom Events. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/storage/cancel-requests/q/platform/[platform].mdx b/src/pages/lib-v1/storage/cancel-requests/q/platform/[platform].mdx
index 3b886c6eee9..51f51b901c3 100644
--- a/src/pages/lib-v1/storage/cancel-requests/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/cancel-requests/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Cancel requests`,
   description: `Cancel an in-flight get or put requests from Storage`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
diff --git a/src/pages/lib-v1/storage/configureaccess/q/platform/[platform].mdx b/src/pages/lib-v1/storage/configureaccess/q/platform/[platform].mdx
index beca558da5e..159aa5d5ca4 100644
--- a/src/pages/lib-v1/storage/configureaccess/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/configureaccess/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `File access levels`,
-  description: `Learn about configuring different access levels in Amplify Storage. Objects can be public, protected, or private.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn about configuring different access levels in Amplify Storage. Objects can be public, protected, or private.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/storage/copy/q/platform/[platform].mdx b/src/pages/lib-v1/storage/copy/q/platform/[platform].mdx
index dd9541ff9a5..c1659675314 100644
--- a/src/pages/lib-v1/storage/copy/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/copy/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Copy files`,
   description: `Learn more about how to copy files using Amplify's storage category.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
diff --git a/src/pages/lib-v1/storage/download/q/platform/[platform].mdx b/src/pages/lib-v1/storage/download/q/platform/[platform].mdx
index d11c148ff0c..06fdb0890e7 100644
--- a/src/pages/lib-v1/storage/download/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/download/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Download files`,
-  description: `Learn more about how to download / retrieve files using the Storage category of Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to download / retrieve files using the Storage category of Amplify`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/storage/escapehatch/q/platform/[platform].mdx b/src/pages/lib-v1/storage/escapehatch/q/platform/[platform].mdx
index 1fd22c8dd09..fda851bb52c 100644
--- a/src/pages/lib-v1/storage/escapehatch/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/escapehatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
   description: `For specialized use cases where Amplify does not provide the functionality, you can use the escape hatch to access an AWSS3 low-level client instance. The returned AWSS3 instance is already configured with your access credentials.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/storage/existing-resources/q/platform/[platform].mdx b/src/pages/lib-v1/storage/existing-resources/q/platform/[platform].mdx
index 80ce50f721b..6a72dbb7d12 100644
--- a/src/pages/lib-v1/storage/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing AWS resources`,
-  description: `Configure the Amplify Libraries to use an existing Amazon S3 bucket by referencing it in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Configure the Amplify Libraries to use an existing Amazon S3 bucket by referencing it in your configuration.`
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/storage/getting-started/q/platform/[platform].mdx b/src/pages/lib-v1/storage/getting-started/q/platform/[platform].mdx
index b846e0d9e9b..bc207b52b8a 100644
--- a/src/pages/lib-v1/storage/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `The Amplify Storage category provides a simple mechanism for managing user content for your app in public, protected, or private storage buckets. The Amplify AWS S3 Storage plugin leverages Amazon S3.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amplify Storage category provides a simple mechanism for managing user content for your app in public, protected, or private storage buckets. The Amplify AWS S3 Storage plugin leverages Amazon S3.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/storage/list/q/platform/[platform].mdx b/src/pages/lib-v1/storage/list/q/platform/[platform].mdx
index 9ef2ba950e0..ab9336f5320 100644
--- a/src/pages/lib-v1/storage/list/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/list/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `List files`,
-  description: `Learn more about how to list all of the uploaded objects using Amplify's storage category.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to list all of the uploaded objects using Amplify's storage category.`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/storage/overview/q/platform/[platform].mdx b/src/pages/lib-v1/storage/overview/q/platform/[platform].mdx
index a20a6fedb19..ed6f4b857fa 100644
--- a/src/pages/lib-v1/storage/overview/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/overview/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Concepts`,
-  description: `Learn more about the foundational storage concepts for cloud-based application and how they work with Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about the foundational storage concepts for cloud-based application and how they work with Amplify.`
 };
 
 import flutter_maintenance from '/src/fragments/lib-v1/flutter-maintenance.mdx';
diff --git a/src/pages/lib-v1/storage/remove/q/platform/[platform].mdx b/src/pages/lib-v1/storage/remove/q/platform/[platform].mdx
index 075116085d4..567b2e7e9a0 100644
--- a/src/pages/lib-v1/storage/remove/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/remove/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Remove files`,
-  description: `Learn more about how to remove files using Amplify's storage category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to remove files using Amplify's storage category`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/storage/triggers/q/platform/[platform].mdx b/src/pages/lib-v1/storage/triggers/q/platform/[platform].mdx
index 6c9c8790a07..e6f38d450b7 100644
--- a/src/pages/lib-v1/storage/triggers/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/triggers/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Lambda triggers`,
-  description: `Learn more about how to enable triggers for the Storage Category with Amazon S3 & Amazon DynamoDB as Providers. The CLI supports associating Lambda triggers with S3 and DynamoDB events. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to enable triggers for the Storage Category with Amazon S3 & Amazon DynamoDB as Providers. The CLI supports associating Lambda triggers with S3 and DynamoDB events. `
 };
 
 import flutter_maintenance from '/src/fragments/lib-v1/flutter-maintenance.mdx';
diff --git a/src/pages/lib-v1/storage/upload/q/platform/[platform].mdx b/src/pages/lib-v1/storage/upload/q/platform/[platform].mdx
index 5050bdfb54b..50c4d4c87ab 100644
--- a/src/pages/lib-v1/storage/upload/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/storage/upload/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Upload files`,
-  description: `Learn more about how to upload files using Amplify's storage category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to upload files using Amplify's storage category`
 };
 
 import ios_maintenance from '/src/fragments/lib-v1/ios-maintenance.mdx';
diff --git a/src/pages/lib-v1/troubleshooting/upgrading/q/platform/[platform].mdx b/src/pages/lib-v1/troubleshooting/upgrading/q/platform/[platform].mdx
index a7ecc604807..9e58d8a6cda 100644
--- a/src/pages/lib-v1/troubleshooting/upgrading/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/troubleshooting/upgrading/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Upgrading Amplify packages  `,
-  description: `Upgrading Amplify packages `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Upgrading Amplify packages `
 };
 
 import flutter1 from '/src/fragments/lib-v1/troubleshooting/flutter/upgrading.mdx';
diff --git a/src/pages/lib-v1/utilities/cache/q/platform/[platform].mdx b/src/pages/lib-v1/utilities/cache/q/platform/[platform].mdx
index 6875779290a..435da188ef0 100644
--- a/src/pages/lib-v1/utilities/cache/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/utilities/cache/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Cache`,
   description: `The Amplify Cache module provides a generic LRU cache for JavaScript developers to store data with priority and expiration settings.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/utilities/hub/q/platform/[platform].mdx b/src/pages/lib-v1/utilities/hub/q/platform/[platform].mdx
index 6a8e7742451..614148123e3 100644
--- a/src/pages/lib-v1/utilities/hub/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/utilities/hub/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Hub`,
   description: `Amplify has a local eventing system called Hub. It is a lightweight implementation of Publisher-Subscriber pattern, and is used to share data between modules and components in your app. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android_maintenance from '/src/fragments/lib-v1/android-maintenance.mdx';
diff --git a/src/pages/lib-v1/utilities/i18n/q/platform/[platform].mdx b/src/pages/lib-v1/utilities/i18n/q/platform/[platform].mdx
index 7945a9521ca..a0b0ccdb6b8 100644
--- a/src/pages/lib-v1/utilities/i18n/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/utilities/i18n/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Internationalization`,
   description: `The AWS Amplify I18n module is a lightweight internationalization solution.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/utilities/logger/q/platform/[platform].mdx b/src/pages/lib-v1/utilities/logger/q/platform/[platform].mdx
index 0c519cdddf6..5cf02b4cdbb 100644
--- a/src/pages/lib-v1/utilities/logger/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/utilities/logger/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Logger`,
   description: `AWS Amplify writes console logs through Logger. You can use Logger in your apps for the same purpose.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib-v1/utilities/serviceworker/q/platform/[platform].mdx b/src/pages/lib-v1/utilities/serviceworker/q/platform/[platform].mdx
index 4bc4a77dfb5..180b638194a 100644
--- a/src/pages/lib-v1/utilities/serviceworker/q/platform/[platform].mdx
+++ b/src/pages/lib-v1/utilities/serviceworker/q/platform/[platform].mdx
@@ -1,23 +1,4 @@
 export const meta = {
   title: `Service Worker`,
   description: `AWS Amplify ServiceWorker class enables registering a service worker in the browser and communicating with it via postMessage events, so that you can create rich offline experiences with Push APIs and analytics.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
\ No newline at end of file
diff --git a/src/pages/lib/analytics/autotrack/q/platform/[platform].mdx b/src/pages/lib/analytics/autotrack/q/platform/[platform].mdx
index f311a8044aa..635cbfd5d07 100644
--- a/src/pages/lib/analytics/autotrack/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/autotrack/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Automatically track sessions`,
-  description: `The Amplify analytics plugin records when an application opens and closes. This session information can be viewed either from your local computer’s terminal or the AWS Console for Pinpoint.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amplify analytics plugin records when an application opens and closes. This session information can be viewed either from your local computer’s terminal or the AWS Console for Pinpoint.`
 };
 
 <!-- TODO_ double check what the session tracking API possibilities are for iOS/Flutter/Android -->
diff --git a/src/pages/lib/analytics/create-custom-plugin/q/platform/[platform].mdx b/src/pages/lib/analytics/create-custom-plugin/q/platform/[platform].mdx
index 10bfff17861..a4c97f6ef16 100644
--- a/src/pages/lib/analytics/create-custom-plugin/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/create-custom-plugin/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Create a custom plugin`,
-  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`
 };
 
 import js0 from '/src/fragments/lib/analytics/js/create-custom-plugin.mdx';
diff --git a/src/pages/lib/analytics/enable-disable/q/platform/[platform].mdx b/src/pages/lib/analytics/enable-disable/q/platform/[platform].mdx
index 6c105c6f0a9..a694b9cc91f 100644
--- a/src/pages/lib/analytics/enable-disable/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/enable-disable/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Enable/Disable Analytics`,
-  description: `Learn how to enable/disable analytics using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to enable/disable analytics using Amplify.`
 };
 
 ## Disable Analytics
diff --git a/src/pages/lib/analytics/escapehatch/q/platform/[platform].mdx b/src/pages/lib/analytics/escapehatch/q/platform/[platform].mdx
index 45ba2ab3282..2e47beb866e 100644
--- a/src/pages/lib/analytics/escapehatch/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/escapehatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
   description: `For advanced use cases where Amplify does not provide the functionality, you can retrieve the escape hatch to access the AWSPinpoint instance.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/analytics/ios/escapehatch.mdx";
diff --git a/src/pages/lib/analytics/existing-resources/q/platform/[platform].mdx b/src/pages/lib/analytics/existing-resources/q/platform/[platform].mdx
index 89f8c3f7afb..85e86d40240 100644
--- a/src/pages/lib/analytics/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing AWS resources`,
-  description: `Configure the Amplify Libraries to use existing Amazon Pinpoint resources by referencing them in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Configure the Amplify Libraries to use existing Amazon Pinpoint resources by referencing them in your configuration.`
 };
 
 import android0 from '/src/fragments/lib/analytics/android/existing-resources.mdx';
diff --git a/src/pages/lib/analytics/getting-started/q/platform/[platform].mdx b/src/pages/lib/analytics/getting-started/q/platform/[platform].mdx
index cd35ee02b70..a5ac42332fa 100644
--- a/src/pages/lib/analytics/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`
 };
 
 import js0 from '/src/fragments/lib/analytics/native_common/getting-started/common.mdx';
diff --git a/src/pages/lib/analytics/identifyuser/q/platform/[platform].mdx b/src/pages/lib/analytics/identifyuser/q/platform/[platform].mdx
index ba627be20f0..32fc4f20e47 100644
--- a/src/pages/lib/analytics/identifyuser/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/identifyuser/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Identify user`,
-  description: `Use the Amplify analytics plugin to inform Pinpoint about your users.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Use the Amplify analytics plugin to inform Pinpoint about your users.`
 };
 
 <!-- TODO Find out how to identify a user with JS and RN -->
diff --git a/src/pages/lib/analytics/personalize/q/platform/[platform].mdx b/src/pages/lib/analytics/personalize/q/platform/[platform].mdx
index 614d6f25d02..bebb7e17b77 100644
--- a/src/pages/lib/analytics/personalize/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/personalize/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Personalized recommendations`,
   description: `Amazon Personalize can create recommendations by using event data, historical data, or a combination of both. The event data can then be used to create recommendations.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/analytics/js/personalize.mdx";
diff --git a/src/pages/lib/analytics/record/q/platform/[platform].mdx b/src/pages/lib/analytics/record/q/platform/[platform].mdx
index 81bbc0b4b05..dd2a6de08b2 100644
--- a/src/pages/lib/analytics/record/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/record/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Record events`,
-  description: `Learn how to record analytics events using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to record analytics events using Amplify.`
 };
 
 import js0 from '/src/fragments/lib/analytics/js/record.mdx';
diff --git a/src/pages/lib/analytics/storing/q/platform/[platform].mdx b/src/pages/lib/analytics/storing/q/platform/[platform].mdx
index 14e2f073e5a..fb35b37042d 100644
--- a/src/pages/lib/analytics/storing/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/storing/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Storing analytics data`,
-  description: `The Amazon Kinesis Firehose analytics provider allows you to send analytics data to an Amazon Kinesis Firehose stream for reliably storing data.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amazon Kinesis Firehose analytics provider allows you to send analytics data to an Amazon Kinesis Firehose stream for reliably storing data.`
 };
 
 import js0 from '/src/fragments/lib/analytics/js/storing.mdx';
diff --git a/src/pages/lib/analytics/streaming/q/platform/[platform].mdx b/src/pages/lib/analytics/streaming/q/platform/[platform].mdx
index 1d95b58297d..fb99afd5afc 100644
--- a/src/pages/lib/analytics/streaming/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/streaming/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Streaming analytics data`,
-  description: `The Amazon Kinesis analytics provider allows you to send analytics data to an Amazon Kinesis stream for real-time processing.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amazon Kinesis analytics provider allows you to send analytics data to an Amazon Kinesis stream for real-time processing.`
 };
 
 import js0 from '/src/fragments/lib/analytics/js/streaming.mdx';
diff --git a/src/pages/lib/analytics/update-endpoint/q/platform/[platform].mdx b/src/pages/lib/analytics/update-endpoint/q/platform/[platform].mdx
index 745d98710ba..8d35c3ae05e 100644
--- a/src/pages/lib/analytics/update-endpoint/q/platform/[platform].mdx
+++ b/src/pages/lib/analytics/update-endpoint/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Update Endpoint`,
-  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Analytics category enables you to collect analytics data for your app. The Analytics category comes with built-in support for Amazon Pinpoint and Amazon Kinesis (Kinesis support is currently only available in the Amplify JavaScript library). The Analytics category uses Amazon Cognito Identity pools to identify users in your App. Cognito allows you to receive data from authenticated, and unauthenticated users in your App.`
 };
 
 import js0 from '/src/fragments/lib/analytics/js/update-endpoint.mdx';
diff --git a/src/pages/lib/auth/access_credentials/q/platform/[platform].mdx b/src/pages/lib/auth/access_credentials/q/platform/[platform].mdx
index 4729d216925..a1baa70c542 100644
--- a/src/pages/lib/auth/access_credentials/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/access_credentials/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Accessing credentials`,
   description: `Use AWS Cognito Auth plugin to access auth credentials`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/auth/native_common/access_credentials/common.mdx";
diff --git a/src/pages/lib/auth/advanced/q/platform/[platform].mdx b/src/pages/lib/auth/advanced/q/platform/[platform].mdx
index 9dcf57d4f8e..68b41a5ea32 100644
--- a/src/pages/lib/auth/advanced/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/advanced/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Advanced workflows`,
   description: `Learn more about advanced workflows in the Amplify auth category. This includes subscribing to events, identity pool federation, auth-related Lambda triggers and working with AWS service objects.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/auth/ios/advanced/advanced.mdx";
diff --git a/src/pages/lib/auth/auth-events/q/platform/[platform].mdx b/src/pages/lib/auth/auth-events/q/platform/[platform].mdx
index 9a4bd9794aa..1366cd7cc52 100644
--- a/src/pages/lib/auth/auth-events/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/auth-events/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Auth events`,
   description: `Listen to various auth events`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 AWS Cognito Auth Plugin sends important events through Amplify Hub.
diff --git a/src/pages/lib/auth/delete_user/q/platform/[platform].mdx b/src/pages/lib/auth/delete_user/q/platform/[platform].mdx
index 5a26363e147..911bfa22b29 100644
--- a/src/pages/lib/auth/delete_user/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/delete_user/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Delete user`,
-  description: `Delete a user`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Delete a user`
 };
 
 import ios0 from '/src/fragments/lib/auth/native_common/delete_user/common.mdx';
diff --git a/src/pages/lib/auth/device_features/q/platform/[platform].mdx b/src/pages/lib/auth/device_features/q/platform/[platform].mdx
index 12218ddf064..301f41ed9a4 100644
--- a/src/pages/lib/auth/device_features/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/device_features/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Remember a device`,
   description: `You can use the device related features of Amazon Cognito UserPools by enabling the Devices features. Go to your Cognito UserPool, click on Devices in Left Navigation Menu and chose one of User Opt In or Always.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/auth/common/device_features/common.mdx";
diff --git a/src/pages/lib/auth/emailpassword/q/platform/[platform].mdx b/src/pages/lib/auth/emailpassword/q/platform/[platform].mdx
index 3d033f129b5..6db8592a484 100644
--- a/src/pages/lib/auth/emailpassword/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/emailpassword/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Enable sign-up, sign-in, and sign-out`,
   description: `Learn how to use Amplify's sign up, sign in and sign out APIs.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 <InlineFilter filters={["js" , "react-native"]}>
diff --git a/src/pages/lib/auth/escapehatch/q/platform/[platform].mdx b/src/pages/lib/auth/escapehatch/q/platform/[platform].mdx
index 8da03c046c7..a1a6a3ad2a7 100644
--- a/src/pages/lib/auth/escapehatch/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/escapehatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
   description: `Underlying service`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/auth/native_common/escape_hatch/common.mdx";
diff --git a/src/pages/lib/auth/existing-resources/q/platform/[platform].mdx b/src/pages/lib/auth/existing-resources/q/platform/[platform].mdx
index c7ec86fecc6..6ebf029366b 100644
--- a/src/pages/lib/auth/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing Amazon Cognito resources`,
   description: `Configure the Amplify Libraries to use existing Amazon Cognito resources by referencing them in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android0 from "/src/fragments/lib/auth/existing-resources.mdx";
diff --git a/src/pages/lib/auth/getting-started/q/platform/[platform].mdx b/src/pages/lib/auth/getting-started/q/platform/[platform].mdx
index 173aca912e6..6fdacec54c5 100644
--- a/src/pages/lib/auth/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Set up Amplify Auth`,
   description: `Amplify uses Amazon Cognito as the main authentication provider. Learn how to handle user registration, authentication, account recovery and other operations.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 <InlineFilter filters={["js"]}>
diff --git a/src/pages/lib/auth/guest_access/q/platform/[platform].mdx b/src/pages/lib/auth/guest_access/q/platform/[platform].mdx
index 6132451b520..4116b9109e3 100644
--- a/src/pages/lib/auth/guest_access/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/guest_access/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Guest access`,
   description: `Access services without needing to sign in.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/auth/native_common/guest_access/common.mdx";
diff --git a/src/pages/lib/auth/manageusers/q/platform/[platform].mdx b/src/pages/lib/auth/manageusers/q/platform/[platform].mdx
index 03c96c57542..4cf6d6cc498 100644
--- a/src/pages/lib/auth/manageusers/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/manageusers/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Password & user management`,
   description: `Learn more about how to handle common password and user management scenarios. E.g. password reset, account recovery etc.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import manageUsers from "/src/fragments/lib/auth/js/manageusers.mdx";
diff --git a/src/pages/lib/auth/managing_credentials/q/platform/[platform].mdx b/src/pages/lib/auth/managing_credentials/q/platform/[platform].mdx
index c9e9a1c6026..dd9441077d7 100644
--- a/src/pages/lib/auth/managing_credentials/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/managing_credentials/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Managing credentials`,
   description: `Learn how to customize credential storage.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import flutter0 from "/src/fragments/lib/auth/flutter/managing_credentials/10_managing_credentials.mdx";
diff --git a/src/pages/lib/auth/mfa/q/platform/[platform].mdx b/src/pages/lib/auth/mfa/q/platform/[platform].mdx
index b2476ae6060..c65900319cb 100644
--- a/src/pages/lib/auth/mfa/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/mfa/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Multi-factor authentication`,
   description: `Learn how to enable multi-factor authentication with Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/auth/js/mfa.mdx";
diff --git a/src/pages/lib/auth/overview/q/platform/[platform].mdx b/src/pages/lib/auth/overview/q/platform/[platform].mdx
index f62919bc598..1bca562f413 100644
--- a/src/pages/lib/auth/overview/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/overview/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Under the hood`,
   description: `Learn more about the foundational auth concepts for cloud-based application and how they work with Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/auth/js/overview.mdx";
diff --git a/src/pages/lib/auth/password_management/q/platform/[platform].mdx b/src/pages/lib/auth/password_management/q/platform/[platform].mdx
index 79615492d36..0006f255d37 100644
--- a/src/pages/lib/auth/password_management/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/password_management/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Password management`,
   description: `Use AWS Cognito Auth plugin to update or reset user password`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/auth/native_common/password_management/common.mdx";
diff --git a/src/pages/lib/auth/signOut/q/platform/[platform].mdx b/src/pages/lib/auth/signOut/q/platform/[platform].mdx
index 45a99b3c6a7..2d5851855d6 100644
--- a/src/pages/lib/auth/signOut/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/signOut/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Sign out`,
   description: `SignOut a user`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/auth/native_common/signout/common.mdx";
diff --git a/src/pages/lib/auth/signin/q/platform/[platform].mdx b/src/pages/lib/auth/signin/q/platform/[platform].mdx
index 7c3efec25cb..6af5606ea47 100644
--- a/src/pages/lib/auth/signin/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/signin/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Sign in`,
   description: `Use AWS Cognito Auth plugin to sign in a user into AWS Cognito User Pool`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/auth/native_common/signin/common.mdx";
diff --git a/src/pages/lib/auth/signin_next_steps/q/platform/[platform].mdx b/src/pages/lib/auth/signin_next_steps/q/platform/[platform].mdx
index 492cb836c93..45b320ef971 100644
--- a/src/pages/lib/auth/signin_next_steps/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/signin_next_steps/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Sign in next steps`,
   description: `Use AWS Cognito Auth plugin to complete a multi step authentication flow`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/auth/native_common/signin_next_steps/common.mdx";
diff --git a/src/pages/lib/auth/signin_web_ui/q/platform/[platform].mdx b/src/pages/lib/auth/signin_web_ui/q/platform/[platform].mdx
index 9db0374c783..969b9f6a9ac 100644
--- a/src/pages/lib/auth/signin_web_ui/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/signin_web_ui/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Sign in with web UI`,
   description: `Use AWS Cognito Auth plugin to register and authenticate a user with a prebuilt web UI`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/auth/native_common/signin_web_ui/common.mdx";
diff --git a/src/pages/lib/auth/signin_with_custom_flow/q/platform/[platform].mdx b/src/pages/lib/auth/signin_with_custom_flow/q/platform/[platform].mdx
index 40af4943006..db9c0297008 100644
--- a/src/pages/lib/auth/signin_with_custom_flow/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/signin_with_custom_flow/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Sign in with custom flow`,
-  description: `Use AWS Cognito Auth plugin to sign in a user into AWS Cognito User Pool using user defined custom flow`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Use AWS Cognito Auth plugin to sign in a user into AWS Cognito User Pool using user defined custom flow`
 };
 
 import ios0 from '/src/fragments/lib/auth/native_common/signin_with_custom_flow/common.mdx';
diff --git a/src/pages/lib/auth/sms_flows/q/platform/[platform].mdx b/src/pages/lib/auth/sms_flows/q/platform/[platform].mdx
index 79e1bdc6eec..ece32e2dc63 100644
--- a/src/pages/lib/auth/sms_flows/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/sms_flows/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `SMS flows`,
   description: `Using phone numbers for sign-in and verification`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import flutter0 from "/src/fragments/lib/auth/common/sms/flows.mdx";
diff --git a/src/pages/lib/auth/social/q/platform/[platform].mdx b/src/pages/lib/auth/social/q/platform/[platform].mdx
index dce988d7881..747ea2b6b54 100644
--- a/src/pages/lib/auth/social/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/social/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Social sign-in (OAuth)`,
   description: `Learn how to setup social sign-in providers like Facebook, Google, Amazon, or Sign in with Apple.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/auth/js/social.mdx";
diff --git a/src/pages/lib/auth/start/q/platform/[platform].mdx b/src/pages/lib/auth/start/q/platform/[platform].mdx
index 941b0cd72ce..144d70dd299 100644
--- a/src/pages/lib/auth/start/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/start/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Create or re-use existing backend`,
   description: `Learn more about how to create an auth resource or re-use an existing auth backend for Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/auth/js/start.mdx";
diff --git a/src/pages/lib/auth/switch-auth/q/platform/[platform].mdx b/src/pages/lib/auth/switch-auth/q/platform/[platform].mdx
index 804988cfba2..9025b8a1840 100644
--- a/src/pages/lib/auth/switch-auth/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/switch-auth/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Switching authentication flows`,
   description: `Learn more about how to switch between different auth flows in Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/auth/ios/switch-auth/switch-auth.mdx";
diff --git a/src/pages/lib/auth/user-attributes/q/platform/[platform].mdx b/src/pages/lib/auth/user-attributes/q/platform/[platform].mdx
index 3fe55468f7a..339c0ca9cd9 100644
--- a/src/pages/lib/auth/user-attributes/q/platform/[platform].mdx
+++ b/src/pages/lib/auth/user-attributes/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `User attributes`,
   description: `Access and update user attributes`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/auth/native_common/user_attributes/common.mdx";
diff --git a/src/pages/lib/client-configuration/configuring-amplify-categories/q/platform/[platform].mdx b/src/pages/lib/client-configuration/configuring-amplify-categories/q/platform/[platform].mdx
index e027bac0e7d..e372a28a5ea 100644
--- a/src/pages/lib/client-configuration/configuring-amplify-categories/q/platform/[platform].mdx
+++ b/src/pages/lib/client-configuration/configuring-amplify-categories/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Configuring Amplify Categories`,
-  description: `Configuring the client `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Configuring the client `
 };
 
 import js0 from '/src/fragments/lib/client-configuration/js/js-configuration.mdx';
diff --git a/src/pages/lib/datastore/advanced-workflows/q/platform/[platform].mdx b/src/pages/lib/datastore/advanced-workflows/q/platform/[platform].mdx
index 1ed6d71cdab..aa66ec098b0 100644
--- a/src/pages/lib/datastore/advanced-workflows/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/advanced-workflows/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Advanced workflows`,
   description: `Learn more about advanced workflows in the Amplify DataStore category, including custom primary keys.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/datastore/native_common/advanced-workflows.mdx";
diff --git a/src/pages/lib/datastore/auth-model/q/platform/[platform].mdx b/src/pages/lib/datastore/auth-model/q/platform/[platform].mdx
index 59160a402dd..11eb7811b87 100644
--- a/src/pages/lib/datastore/auth-model/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/auth-model/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Models with authorization`,
   description: `Learn more about how DataStore handles Models with finer grain authorization access checks.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 In order to configure fine grain authorization controls with DataStore, use the `@auth` directive to specify ownership and permissible operations (create, update, delete, read) on a specific type. More information can be found on the @auth directive in the [GraphQL Transformer documentation](/cli/graphql/authorization-rules).
diff --git a/src/pages/lib/datastore/conflict/q/platform/[platform].mdx b/src/pages/lib/datastore/conflict/q/platform/[platform].mdx
index a8fc2467a9c..714ceccb61d 100644
--- a/src/pages/lib/datastore/conflict/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/conflict/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Conflict resolution`,
-  description: `Learn more about how conflict resolution in DataStore is managed and how to configure it.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how conflict resolution in DataStore is managed and how to configure it.`
 };
 
 import ios0 from '/src/fragments/lib/datastore/native_common/conflict.mdx';
diff --git a/src/pages/lib/datastore/data-access/q/platform/[platform].mdx b/src/pages/lib/datastore/data-access/q/platform/[platform].mdx
index 60e9af90c19..86a206835f9 100644
--- a/src/pages/lib/datastore/data-access/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/data-access/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Manipulating data`,
-  description: `Learn how to save, query, paginate, update, delete and observe data in DataStore.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to save, query, paginate, update, delete and observe data in DataStore.`
 };
 
 import ios0 from '/src/fragments/lib/datastore/native_common/data-access.mdx';
diff --git a/src/pages/lib/datastore/datastore-events/q/platform/[platform].mdx b/src/pages/lib/datastore/datastore-events/q/platform/[platform].mdx
index f7da37cf285..bbf044cf535 100644
--- a/src/pages/lib/datastore/datastore-events/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/datastore-events/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `DataStore Events`,
-  description: `Listening to DataStore events`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Listening to DataStore events`
 };
 
 DataStore periodically publishes state notifications onto Amplify's Hub. You can subscribe to the Hub to gain insight into the internal state of the DataStore. Events are published when:
diff --git a/src/pages/lib/datastore/examples/q/platform/[platform].mdx b/src/pages/lib/datastore/examples/q/platform/[platform].mdx
index da1e8828072..d788111c167 100644
--- a/src/pages/lib/datastore/examples/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/examples/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Examples`,
-  description: `Full examples and resources using Amplify DataStore.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Full examples and resources using Amplify DataStore.`
 };
 
 import js0 from '/src/fragments/lib/datastore/js/examples.mdx';
diff --git a/src/pages/lib/datastore/getting-started/q/platform/[platform].mdx b/src/pages/lib/datastore/getting-started/q/platform/[platform].mdx
index 7ef0ade901d..d64e23b3ba0 100644
--- a/src/pages/lib/datastore/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `Amplify DataStore provides a programming model for leveraging shared and distributed data without writing additional code for offline and online scenarios, which makes working with distributed, cross-user data just as simple as working with local-only data.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Amplify DataStore provides a programming model for leveraging shared and distributed data without writing additional code for offline and online scenarios, which makes working with distributed, cross-user data just as simple as working with local-only data.`
 };
 
 import ios0 from '/src/fragments/lib/datastore/native_common/getting-started.mdx';
diff --git a/src/pages/lib/datastore/how-it-works/q/platform/[platform].mdx b/src/pages/lib/datastore/how-it-works/q/platform/[platform].mdx
index a42b121f993..03562b84f4d 100644
--- a/src/pages/lib/datastore/how-it-works/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/how-it-works/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `How it works`,
-  description: `Amplify DataStore provides a persistent on-device storage repository for you to write, read, and observe changes to data if you are online or offline, and seamlessly sync to the cloud as well as across devices. Learn more about how it works.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Amplify DataStore provides a persistent on-device storage repository for you to write, read, and observe changes to data if you are online or offline, and seamlessly sync to the cloud as well as across devices. Learn more about how it works.`
 };
 
 import ios0 from '/src/fragments/lib/datastore/native_common/how-it-works.mdx';
diff --git a/src/pages/lib/datastore/other-methods/q/platform/[platform].mdx b/src/pages/lib/datastore/other-methods/q/platform/[platform].mdx
index 4e79e1b3fef..b8422f90853 100644
--- a/src/pages/lib/datastore/other-methods/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/other-methods/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Other methods`,
-  description: `Other Amplify DataStore methods`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Other Amplify DataStore methods`
 };
 
 import js0 from '/src/fragments/lib/datastore/js/other-methods.mdx';
diff --git a/src/pages/lib/datastore/real-time/q/platform/[platform].mdx b/src/pages/lib/datastore/real-time/q/platform/[platform].mdx
index dcb064b397c..8ad319c862c 100644
--- a/src/pages/lib/datastore/real-time/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/real-time/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Real time`,
-  description: `Learn more about how DataStore handles data changes in real-time.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how DataStore handles data changes in real-time.`
 };
 
 import ios0 from '/src/fragments/lib/datastore/native_common/real-time.mdx';
diff --git a/src/pages/lib/datastore/relational/q/platform/[platform].mdx b/src/pages/lib/datastore/relational/q/platform/[platform].mdx
index 14e0196a81f..6e02d07adde 100644
--- a/src/pages/lib/datastore/relational/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/relational/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Relational models`,
-  description: `Learn more about how DataStore handles relationships between Models, such as "has one", "has many", "belongs to".`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how DataStore handles relationships between Models, such as "has one", "has many", "belongs to".`
 };
 
 import gqlv2callout from '/src/fragments/cli/gqlv2callout.mdx';
diff --git a/src/pages/lib/datastore/schema-updates/q/platform/[platform].mdx b/src/pages/lib/datastore/schema-updates/q/platform/[platform].mdx
index ef39257e3f7..0ca365195a6 100644
--- a/src/pages/lib/datastore/schema-updates/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/schema-updates/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Schema updates`,
-  description: `Learn more about how to issue schema updates for DataStore`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to issue schema updates for DataStore`
 };
 
 import ios0 from '/src/fragments/lib/datastore/native_common/schema-updates.mdx';
diff --git a/src/pages/lib/datastore/setup-auth-rules/q/platform/[platform].mdx b/src/pages/lib/datastore/setup-auth-rules/q/platform/[platform].mdx
index bce97309bfd..d5224e7db75 100644
--- a/src/pages/lib/datastore/setup-auth-rules/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/setup-auth-rules/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Setup authorization rules`,
-  description: `Learn how to apply authorization rules to your models with the @auth directive`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to apply authorization rules to your models with the @auth directive`
 };
 
 import ios0 from '/src/fragments/lib/datastore/native_common/setup-auth-rules.mdx';
diff --git a/src/pages/lib/datastore/sync/q/platform/[platform].mdx b/src/pages/lib/datastore/sync/q/platform/[platform].mdx
index d1adf24d744..fc4e79c1a74 100644
--- a/src/pages/lib/datastore/sync/q/platform/[platform].mdx
+++ b/src/pages/lib/datastore/sync/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Syncing data to cloud`,
-  description: `Learn more about how DataStore connects to an AppSync backend and automatically syncs all locally saved data using GraphQL.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how DataStore connects to an AppSync backend and automatically syncs all locally saved data using GraphQL.`
 };
 
 import ios0 from '/src/fragments/lib/datastore/native_common/sync.mdx';
diff --git a/src/pages/lib/debugging/dev-menu/q/platform/[platform].mdx b/src/pages/lib/debugging/dev-menu/q/platform/[platform].mdx
index 4872049e9b0..184fbdadc52 100644
--- a/src/pages/lib/debugging/dev-menu/q/platform/[platform].mdx
+++ b/src/pages/lib/debugging/dev-menu/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Developer Menu`,
   description: `Amplify developer menu helps you quickly file GitHub issues with critical information (environment and device information) automatically added to the issue description. Learn how to setup, activate, and use the developer menu.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/debugging/native_common/dev-menu/common.mdx";
diff --git a/src/pages/lib/geo/device-tracking/q/platform/[platform].mdx b/src/pages/lib/geo/device-tracking/q/platform/[platform].mdx
index 1a38aaaeb20..50ff2b08450 100644
--- a/src/pages/lib/geo/device-tracking/q/platform/[platform].mdx
+++ b/src/pages/lib/geo/device-tracking/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Device Tracking`,
-  description: `The Amplify Geo category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amplify Geo category`
 };
 
 import ios0 from "/src/fragments/lib/geo/native_common/device_tracking/common.mdx";
diff --git a/src/pages/lib/geo/escapehatch/q/platform/[platform].mdx b/src/pages/lib/geo/escapehatch/q/platform/[platform].mdx
index b5d58f0b06f..a60bfcba203 100644
--- a/src/pages/lib/geo/escapehatch/q/platform/[platform].mdx
+++ b/src/pages/lib/geo/escapehatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
   description: `For specialized use cases where Amplify does not provide the functionality, you can use the escape hatch to access a low-level client instance for Amazon Location Service.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/geo/js/escapehatch.mdx";
diff --git a/src/pages/lib/geo/existing-resources/q/platform/[platform].mdx b/src/pages/lib/geo/existing-resources/q/platform/[platform].mdx
index fdb22abe177..76ac603c223 100644
--- a/src/pages/lib/geo/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib/geo/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing Amazon Location Service resources`,
   description: `Configure Amplify Geo to use existing Amazon Location Service resources by referencing them in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/geo/existing-resources.mdx";
diff --git a/src/pages/lib/geo/geofences/q/platform/[platform].mdx b/src/pages/lib/geo/geofences/q/platform/[platform].mdx
index b1a795a02ac..ead06fe5a9c 100644
--- a/src/pages/lib/geo/geofences/q/platform/[platform].mdx
+++ b/src/pages/lib/geo/geofences/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Geofences`,
-  description: `The Amplify Geo category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amplify Geo category`
 };
 
 import js0 from '/src/fragments/lib/geo/js/geofences.mdx';
diff --git a/src/pages/lib/geo/getting-started/q/platform/[platform].mdx b/src/pages/lib/geo/getting-started/q/platform/[platform].mdx
index 25928c7c480..4c204aabaa7 100644
--- a/src/pages/lib/geo/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/geo/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
   description: `AWS Amplify Geo module provides a simple way to get map data, search for places, and reverse geocoding.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/geo/js/getting-started.mdx";
diff --git a/src/pages/lib/geo/google-migration/q/platform/[platform].mdx b/src/pages/lib/geo/google-migration/q/platform/[platform].mdx
index 03daaff3322..37617dd43fd 100644
--- a/src/pages/lib/geo/google-migration/q/platform/[platform].mdx
+++ b/src/pages/lib/geo/google-migration/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Migrating from Google Maps`,
-  description: `Migrate applications from Google Maps to Amplify Geo`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Migrate applications from Google Maps to Amplify Geo`
 };
 
 import js0 from '/src/fragments/lib/geo/js/google-migration.mdx';
diff --git a/src/pages/lib/geo/maps/q/platform/[platform].mdx b/src/pages/lib/geo/maps/q/platform/[platform].mdx
index 63738935e9a..df9b59f26ee 100644
--- a/src/pages/lib/geo/maps/q/platform/[platform].mdx
+++ b/src/pages/lib/geo/maps/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Maps`,
   description: `The Amplify Geo category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/geo/js/maps.mdx";
diff --git a/src/pages/lib/geo/search/q/platform/[platform].mdx b/src/pages/lib/geo/search/q/platform/[platform].mdx
index d5ed122e494..526e52fd486 100644
--- a/src/pages/lib/geo/search/q/platform/[platform].mdx
+++ b/src/pages/lib/geo/search/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Location Search`,
   description: `The Amplify Geo category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/geo/js/search.mdx";
diff --git a/src/pages/lib/graphqlapi/advanced-workflows/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/advanced-workflows/q/platform/[platform].mdx
index da315d752c2..f6c8a7854c5 100644
--- a/src/pages/lib/graphqlapi/advanced-workflows/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/advanced-workflows/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Advanced Workflows`,
-  description: `Learn more about advanced workflows in Amplify's API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about advanced workflows in Amplify's API category`
 };
 
 import js1 from '/src/fragments/lib/graphqlapi/js/delta-sync.mdx';
diff --git a/src/pages/lib/graphqlapi/authz/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/authz/q/platform/[platform].mdx
index e493b23102c..4531de9fa56 100644
--- a/src/pages/lib/graphqlapi/authz/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/authz/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Configure authorization modes`,
-  description: `Learn more about how to configure authorization modes in Amplify's API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to configure authorization modes in Amplify's API category`
 };
 
 import ios0 from '/src/fragments/lib/graphqlapi/native_common/authz/common.mdx';
diff --git a/src/pages/lib/graphqlapi/cancel-request/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/cancel-request/q/platform/[platform].mdx
index b831053bce0..04366b74a24 100644
--- a/src/pages/lib/graphqlapi/cancel-request/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/cancel-request/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Cancel API requests`,
-  description: `Learn more about how to cancel query or mutation requests with Amplify's GraphQL API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to cancel query or mutation requests with Amplify's GraphQL API category`
 };
 
 import js0 from '/src/fragments/lib/graphqlapi/js/cancel-request.mdx';
diff --git a/src/pages/lib/graphqlapi/concepts/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/concepts/q/platform/[platform].mdx
index 56c0494e55f..20ce0f19354 100644
--- a/src/pages/lib/graphqlapi/concepts/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/concepts/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Concepts`,
-  description: `Learn more about the foundation concepts of Amplify's API category.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about the foundation concepts of Amplify's API category.`
 };
 
 import js0 from '/src/fragments/lib/graphqlapi/native_common/concepts.mdx';
diff --git a/src/pages/lib/graphqlapi/existing-resources/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/existing-resources/q/platform/[platform].mdx
index a9106ff6ab1..7e842aead13 100644
--- a/src/pages/lib/graphqlapi/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing AWS resources`,
-  description: `Configure the Amplify Libraries to use existing AWS AppSync resources by referencing them in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Configure the Amplify Libraries to use existing AWS AppSync resources by referencing them in your configuration.`
 };
 
 import android0 from '/src/fragments/lib/graphqlapi/existing-resources.mdx';
diff --git a/src/pages/lib/graphqlapi/getting-started/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/getting-started/q/platform/[platform].mdx
index b5e147d1ee0..22e0e144ee0 100644
--- a/src/pages/lib/graphqlapi/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `Learn more about how to get started with Amplify's API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to get started with Amplify's API category`
 };
 
 import ios0 from '/src/fragments/lib/graphqlapi/native_common/getting-started/common.mdx';
diff --git a/src/pages/lib/graphqlapi/graphql-from-nodejs/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/graphql-from-nodejs/q/platform/[platform].mdx
index d425934aa72..c5a190c9ad9 100644
--- a/src/pages/lib/graphqlapi/graphql-from-nodejs/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/graphql-from-nodejs/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `GraphQL from NodeJS`,
-  description: `Learn more about how to call an AppSync GraphQL API from a NodeJS app or a Lambda function`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to call an AppSync GraphQL API from a NodeJS app or a Lambda function`
 };
 
 import js0 from '/src/fragments/lib/graphqlapi/graphql-from-node.mdx';
diff --git a/src/pages/lib/graphqlapi/mutate-data/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/mutate-data/q/platform/[platform].mdx
index 664a7bb2c65..d3b6088e63c 100644
--- a/src/pages/lib/graphqlapi/mutate-data/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/mutate-data/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Create, update, delete data`,
-  description: `Learn more about how to create and update data using GraphQL APIs in Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to create and update data using GraphQL APIs in Amplify`
 };
 
 import ios0 from '/src/fragments/lib/graphqlapi/ios/mutate-data.mdx';
diff --git a/src/pages/lib/graphqlapi/offline/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/offline/q/platform/[platform].mdx
index c9863f14d59..3d6cfa2468f 100644
--- a/src/pages/lib/graphqlapi/offline/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/offline/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Offline scenarios`,
-  description: `Learn more about how to support offline scenarios with Amplify's GraphQL API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to support offline scenarios with Amplify's GraphQL API category`
 };
 
 import js0 from '/src/fragments/lib/graphqlapi/js/offline.mdx';
diff --git a/src/pages/lib/graphqlapi/optimistic-ui/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/optimistic-ui/q/platform/[platform].mdx
index 1d8dc0bbcf5..026c73a0614 100644
--- a/src/pages/lib/graphqlapi/optimistic-ui/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/optimistic-ui/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Optimistic UI`,
-  description: `Learn more about implementing optimistic UI with Amplify GraphQL API.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about implementing optimistic UI with Amplify GraphQL API.`
 };
 
 import js0 from '/src/fragments/lib/graphqlapi/js/optimistic-ui.mdx';
diff --git a/src/pages/lib/graphqlapi/query-data/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/query-data/q/platform/[platform].mdx
index 02d99bd4a40..95116bacb45 100644
--- a/src/pages/lib/graphqlapi/query-data/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/query-data/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Fetch data`,
-  description: `Learn more about how to fetch data using Amplify's GraphQL API category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to fetch data using Amplify's GraphQL API category`
 };
 
 import ios0 from '/src/fragments/lib/graphqlapi/ios/query-data.mdx';
diff --git a/src/pages/lib/graphqlapi/subscribe-data/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/subscribe-data/q/platform/[platform].mdx
index 34d93cc1c1d..061a49a8fc0 100644
--- a/src/pages/lib/graphqlapi/subscribe-data/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/subscribe-data/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Subscribe to data`,
-  description: `Learn more about how to observe to data changes using subscriptions in Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to observe to data changes using subscriptions in Amplify.`
 };
 
 import ios0 from '/src/fragments/lib/graphqlapi/ios/subscribe-data.mdx';
diff --git a/src/pages/lib/graphqlapi/upgrade-guide/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/upgrade-guide/q/platform/[platform].mdx
index 7b62289646c..f3be3ea3e1d 100644
--- a/src/pages/lib/graphqlapi/upgrade-guide/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/upgrade-guide/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Upgrade guide`,
-  description: `Learn how to upgrade from AWS AppSync SDK (Maintenance mode) to AWS Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to upgrade from AWS AppSync SDK (Maintenance mode) to AWS Amplify.`
 };
 
 import js0 from '/src/fragments/lib/graphqlapi/js/upgrade-guide.mdx';
diff --git a/src/pages/lib/graphqlapi/working-with-files/q/platform/[platform].mdx b/src/pages/lib/graphqlapi/working-with-files/q/platform/[platform].mdx
index 70b0af8c567..727deb125f3 100644
--- a/src/pages/lib/graphqlapi/working-with-files/q/platform/[platform].mdx
+++ b/src/pages/lib/graphqlapi/working-with-files/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Working with files / attachments`,
-  description: `Learn more about associating Amplify Storage files with Amplify GraphQL API records.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about associating Amplify Storage files with Amplify GraphQL API records.`
 };
 
 import js0 from '/src/fragments/lib/graphqlapi/js/working-with-files.mdx';
diff --git a/src/pages/lib/in-app-messaging/clear-messages/q/platform/[platform].mdx b/src/pages/lib/in-app-messaging/clear-messages/q/platform/[platform].mdx
index db3fef69748..61d5e52aa51 100644
--- a/src/pages/lib/in-app-messaging/clear-messages/q/platform/[platform].mdx
+++ b/src/pages/lib/in-app-messaging/clear-messages/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Clear messages`,
-  description: `Learn more about how to clear synced in-app messages from the user's device.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to clear synced in-app messages from the user's device.`
 };
 
 import reactnative0 from '/src/fragments/lib/in-app-messaging/clear-messages/clear-messages.mdx';
diff --git a/src/pages/lib/in-app-messaging/create-campaign/q/platform/[platform].mdx b/src/pages/lib/in-app-messaging/create-campaign/q/platform/[platform].mdx
index e0f83982cfb..7f5e4308659 100644
--- a/src/pages/lib/in-app-messaging/create-campaign/q/platform/[platform].mdx
+++ b/src/pages/lib/in-app-messaging/create-campaign/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Create an In-App Messaging Campaign`,
-  description: `Learn how to create a new Pinpoint campaign and configure it to be used with your Amplify project.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to create a new Pinpoint campaign and configure it to be used with your Amplify project.`
 };
 
 import reactnative0 from '/src/fragments/lib/in-app-messaging/create-campaign/create-campaign.mdx';
diff --git a/src/pages/lib/in-app-messaging/display-message/q/platform/[platform].mdx b/src/pages/lib/in-app-messaging/display-message/q/platform/[platform].mdx
index ba0469c5151..fe1c6f4640c 100644
--- a/src/pages/lib/in-app-messaging/display-message/q/platform/[platform].mdx
+++ b/src/pages/lib/in-app-messaging/display-message/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Display message`,
-  description: `Learn how in-app messages are displayed when an In-App Messaging or analytics event is sent and matches the criteria set forth by your active In-App Messaging campaigns.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how in-app messages are displayed when an In-App Messaging or analytics event is sent and matches the criteria set forth by your active In-App Messaging campaigns.`
 };
 
 import reactnative0 from '/src/fragments/lib/in-app-messaging/display-message/display-message.mdx';
diff --git a/src/pages/lib/in-app-messaging/getting-started/q/platform/[platform].mdx b/src/pages/lib/in-app-messaging/getting-started/q/platform/[platform].mdx
index 8f75b2646a1..785ab005d22 100644
--- a/src/pages/lib/in-app-messaging/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/in-app-messaging/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `Learn how to get started with In-App Messaging.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to get started with In-App Messaging.`
 };
 
 import reactnative0 from '/src/fragments/lib/in-app-messaging/getting-started/getting-started.mdx';
diff --git a/src/pages/lib/in-app-messaging/identify-user/q/platform/[platform].mdx b/src/pages/lib/in-app-messaging/identify-user/q/platform/[platform].mdx
index 69fd2a305ad..438fa5d5f99 100644
--- a/src/pages/lib/in-app-messaging/identify-user/q/platform/[platform].mdx
+++ b/src/pages/lib/in-app-messaging/identify-user/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Identify a user`,
-  description: `Learn how to segment and target your In-App Messaging campaigns to specific user subsets.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to segment and target your In-App Messaging campaigns to specific user subsets.`
 };
 
 import reactnative0 from '/src/fragments/lib/in-app-messaging/identify-user/identify-user.mdx';
diff --git a/src/pages/lib/in-app-messaging/integrate-your-application/q/platform/[platform].mdx b/src/pages/lib/in-app-messaging/integrate-your-application/q/platform/[platform].mdx
index b835ea9efc1..badfb7b84e3 100644
--- a/src/pages/lib/in-app-messaging/integrate-your-application/q/platform/[platform].mdx
+++ b/src/pages/lib/in-app-messaging/integrate-your-application/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Integrate your application`,
-  description: `Learn how to integrate your application with In-App Messaging.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to integrate your application with In-App Messaging.`
 };
 
 import reactnative0 from '/src/fragments/lib/in-app-messaging/integrate-your-application/integrate-your-application.mdx';
diff --git a/src/pages/lib/in-app-messaging/overview/q/platform/[platform].mdx b/src/pages/lib/in-app-messaging/overview/q/platform/[platform].mdx
index 42faee60a89..29d9ff3054d 100644
--- a/src/pages/lib/in-app-messaging/overview/q/platform/[platform].mdx
+++ b/src/pages/lib/in-app-messaging/overview/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Overview`,
-  description: `Amplify In-App Messaging helps you better engage your users with messages they can see while actively using your application. Send targeted messages to your defined user segments or even trigger contextual messages based on user behavior. Once you are up and running with In-App Messaging, you’ll be able to create messages that look native to your application and deliver them to your users all without additional code changes.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Amplify In-App Messaging helps you better engage your users with messages they can see while actively using your application. Send targeted messages to your defined user segments or even trigger contextual messages based on user behavior. Once you are up and running with In-App Messaging, you’ll be able to create messages that look native to your application and deliver them to your users all without additional code changes.`
 };
 
 import reactnative0 from '/src/fragments/lib/in-app-messaging/overview/overview.mdx';
diff --git a/src/pages/lib/in-app-messaging/resolve-conflicts/q/platform/[platform].mdx b/src/pages/lib/in-app-messaging/resolve-conflicts/q/platform/[platform].mdx
index aa132519e07..cc25abb5558 100644
--- a/src/pages/lib/in-app-messaging/resolve-conflicts/q/platform/[platform].mdx
+++ b/src/pages/lib/in-app-messaging/resolve-conflicts/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Resolving conflicts`,
-  description: `Learn how to resolve conflicts when an event is sent and meets the criteria set forth by multiple in-app messages.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to resolve conflicts when an event is sent and meets the criteria set forth by multiple in-app messages.`
 };
 
 import reactnative0 from '/src/fragments/lib/in-app-messaging/resolve-conflicts/resolve-conflicts.mdx';
diff --git a/src/pages/lib/in-app-messaging/respond-interaction-events/q/platform/[platform].mdx b/src/pages/lib/in-app-messaging/respond-interaction-events/q/platform/[platform].mdx
index bb3c31ce72c..1cd0cf63c6b 100644
--- a/src/pages/lib/in-app-messaging/respond-interaction-events/q/platform/[platform].mdx
+++ b/src/pages/lib/in-app-messaging/respond-interaction-events/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Respond to interaction events`,
-  description: `Learn how to respond with additional behavior to your users interacting with in-app messages by adding interaction event listeners.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to respond with additional behavior to your users interacting with in-app messages by adding interaction event listeners.`
 };
 
 import reactnative0 from '/src/fragments/lib/in-app-messaging/respond-interaction-events/respond-interaction-events.mdx';
diff --git a/src/pages/lib/in-app-messaging/sync-messages/q/platform/[platform].mdx b/src/pages/lib/in-app-messaging/sync-messages/q/platform/[platform].mdx
index deb2a2e9e05..ffa22059057 100644
--- a/src/pages/lib/in-app-messaging/sync-messages/q/platform/[platform].mdx
+++ b/src/pages/lib/in-app-messaging/sync-messages/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Sync messages`,
-  description: `Learn how to sync in-app messages to your user's local device. Synced messages will be displayed when a matching event is triggered.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to sync in-app messages to your user's local device. Synced messages will be displayed when a matching event is triggered.`
 };
 
 import reactnative0 from '/src/fragments/lib/in-app-messaging/sync-messages/sync-messages.mdx';
diff --git a/src/pages/lib/index.mdx b/src/pages/lib/index.mdx
deleted file mode 100644
index e8a8b2478d5..00000000000
--- a/src/pages/lib/index.mdx
+++ /dev/null
@@ -1,12 +0,0 @@
-import ChooseFilterPage from '@/components/ChooseFilterPage';
-
-import { PLATFORM_FILTER_OPTIONS } from '@/utils/filter-data.ts';
-
-<ChooseFilterPage
-  directoryPath="/ChooseFilterPage"
-  address="/lib"
-  filterKind="platform"
-  filters={PLATFORM_FILTER_OPTIONS}
-  currentFilter="all"
-  message={`Please select one of the following:`}
-/>
diff --git a/src/pages/lib/info/app-uninstall/q/platform/[platform].mdx b/src/pages/lib/info/app-uninstall/q/platform/[platform].mdx
index a878f486d2d..1c1d676ae7c 100644
--- a/src/pages/lib/info/app-uninstall/q/platform/[platform].mdx
+++ b/src/pages/lib/info/app-uninstall/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Uninstalling the app`,
   description: `Learn about the data that gets stored persistently on a device.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android0 from "/src/fragments/lib/info/native_common/app-uninstall/common.mdx";
diff --git a/src/pages/lib/info/overview/q/platform/[platform].mdx b/src/pages/lib/info/overview/q/platform/[platform].mdx
index 888bdf13e4e..42019634e30 100644
--- a/src/pages/lib/info/overview/q/platform/[platform].mdx
+++ b/src/pages/lib/info/overview/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Data Information`,
   description: `Information regarding the data collected by the library`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/info/native_common/data-information/common.mdx";
diff --git a/src/pages/lib/interactions/chatbot/q/platform/[platform].mdx b/src/pages/lib/interactions/chatbot/q/platform/[platform].mdx
index 7d4d767f78c..4a897e5ca5c 100644
--- a/src/pages/lib/interactions/chatbot/q/platform/[platform].mdx
+++ b/src/pages/lib/interactions/chatbot/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Interact with bots`,
-  description: `Learn more about how to integrate chat bot interactions into your application using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to integrate chat bot interactions into your application using Amplify.`
 };
 
 import js0 from '/src/fragments/lib/interactions/js/chatbot.mdx';
diff --git a/src/pages/lib/interactions/getting-started/q/platform/[platform].mdx b/src/pages/lib/interactions/getting-started/q/platform/[platform].mdx
index 5f79b9d5f9a..095f1921e06 100644
--- a/src/pages/lib/interactions/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/interactions/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `AWS Amplify Interactions category enables AI-powered chatbots in your web or mobile apps. You can use Interactions to configure your backend chatbot provider and to integrate a chatbot UI into your app with just a single line of code.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `AWS Amplify Interactions category enables AI-powered chatbots in your web or mobile apps. You can use Interactions to configure your backend chatbot provider and to integrate a chatbot UI into your app with just a single line of code.`
 };
 
 import gettingStartedJs from '/src/fragments/lib/interactions/js/getting-started.mdx';
diff --git a/src/pages/lib/logging/access-logs/q/platform/[platform].mdx b/src/pages/lib/logging/access-logs/q/platform/[platform].mdx
index d91362a5f5e..67ada7b58e9 100644
--- a/src/pages/lib/logging/access-logs/q/platform/[platform].mdx
+++ b/src/pages/lib/logging/access-logs/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `View logs`,
-  description: `View logs in Amazon CloudWatch`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `View logs in Amazon CloudWatch`
 };
 
 import commonRoute from '/src/fragments/lib/logging/common/access_logs/access_logs.mdx';
diff --git a/src/pages/lib/logging/change-local-storage/q/platform/[platform].mdx b/src/pages/lib/logging/change-local-storage/q/platform/[platform].mdx
index 3066e5d0551..ce88854ba8e 100644
--- a/src/pages/lib/logging/change-local-storage/q/platform/[platform].mdx
+++ b/src/pages/lib/logging/change-local-storage/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Change Local Storage`,
-  description: `Change log local storage on device`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Change log local storage on device`
 };
 
 import commonRoute from '/src/fragments/lib/logging/common/change_local_storage/change_local_storage.mdx';
diff --git a/src/pages/lib/logging/change-log-levels/q/platform/[platform].mdx b/src/pages/lib/logging/change-log-levels/q/platform/[platform].mdx
index fdd0b5cd69c..af79813be6c 100644
--- a/src/pages/lib/logging/change-log-levels/q/platform/[platform].mdx
+++ b/src/pages/lib/logging/change-log-levels/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Change Log Levels`,
-  description: `Change log levels by categories and users`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Change log levels by categories and users`
 };
 
 import commonRoute from '/src/fragments/lib/logging/common/change_log_levels/change_log_levels.mdx';
diff --git a/src/pages/lib/logging/configure-user/q/platform/[platform].mdx b/src/pages/lib/logging/configure-user/q/platform/[platform].mdx
index 394b5c16168..89ca56b61bc 100644
--- a/src/pages/lib/logging/configure-user/q/platform/[platform].mdx
+++ b/src/pages/lib/logging/configure-user/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Configure User Allow List`,
-  description: `Configure log levels by user`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Configure log levels by user`
 };
 
 import commonRoute from '/src/fragments/lib/logging/common/configure_user/configure_user.mdx';
diff --git a/src/pages/lib/logging/enable-disable/q/platform/[platform].mdx b/src/pages/lib/logging/enable-disable/q/platform/[platform].mdx
index ee4ce9c4769..ee3d24399dc 100644
--- a/src/pages/lib/logging/enable-disable/q/platform/[platform].mdx
+++ b/src/pages/lib/logging/enable-disable/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Enable Disable Logging`,
-  description: `Enable or disable logging`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Enable or disable logging`
 };
 
 import commonRoute from '/src/fragments/lib/logging/common/enable_disable/enable_disable.mdx';
diff --git a/src/pages/lib/logging/escapehatch/q/platform/[platform].mdx b/src/pages/lib/logging/escapehatch/q/platform/[platform].mdx
index 495d923f68a..d4395a1b62c 100644
--- a/src/pages/lib/logging/escapehatch/q/platform/[platform].mdx
+++ b/src/pages/lib/logging/escapehatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape Hatch`,
-  description: `Get the Amplify Logging escape hatch`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Get the Amplify Logging escape hatch`
 };
 
 import commonRoute from '/src/fragments/lib/logging/common/escapehatch/escapehatch.mdx';
diff --git a/src/pages/lib/logging/flush-logs/q/platform/[platform].mdx b/src/pages/lib/logging/flush-logs/q/platform/[platform].mdx
index 60d680fe12d..66daf1c692e 100644
--- a/src/pages/lib/logging/flush-logs/q/platform/[platform].mdx
+++ b/src/pages/lib/logging/flush-logs/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Flush Logs`,
-  description: `Force flush logs`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Force flush logs`
 };
 
 import commonRoute from '/src/fragments/lib/logging/common/flush_logs/flush_logs.mdx';
diff --git a/src/pages/lib/logging/hub-events/q/platform/[platform].mdx b/src/pages/lib/logging/hub-events/q/platform/[platform].mdx
index acd13980866..2bb3f0f02a2 100644
--- a/src/pages/lib/logging/hub-events/q/platform/[platform].mdx
+++ b/src/pages/lib/logging/hub-events/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Listening to Logging Events`,
-  description: `Listening to Hub Events for Logging`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Listening to Hub Events for Logging`
 };
 
 import commonRoute from '/src/fragments/lib/logging/common/hub_events/hub_events.mdx';
diff --git a/src/pages/lib/logging/remote-configuration/q/platform/[platform].mdx b/src/pages/lib/logging/remote-configuration/q/platform/[platform].mdx
index cde11b77e20..f2ead9f668f 100644
--- a/src/pages/lib/logging/remote-configuration/q/platform/[platform].mdx
+++ b/src/pages/lib/logging/remote-configuration/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Remotely Change Log Levels`,
-  description: `Setup logging to fetch remote log levels`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Setup logging to fetch remote log levels`
 };
 
 import commonRoute from '/src/fragments/lib/logging/common/remote_configuration/remote_configuration.mdx';
diff --git a/src/pages/lib/logging/sending-logs/q/platform/[platform].mdx b/src/pages/lib/logging/sending-logs/q/platform/[platform].mdx
index dc61411159d..0d74968899a 100644
--- a/src/pages/lib/logging/sending-logs/q/platform/[platform].mdx
+++ b/src/pages/lib/logging/sending-logs/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Send logs`,
-  description: `Use of Amplify Logger to write and send logs`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Use of Amplify Logger to write and send logs`
 };
 
 import commonRoute from '/src/fragments/lib/logging/common/sending_logs/sending_logs.mdx';
diff --git a/src/pages/lib/logging/setup-logging/q/platform/[platform].mdx b/src/pages/lib/logging/setup-logging/q/platform/[platform].mdx
index 5b808fa8b5f..483479daaae 100644
--- a/src/pages/lib/logging/setup-logging/q/platform/[platform].mdx
+++ b/src/pages/lib/logging/setup-logging/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Setup Amplify Logging`,
-  description: `Setting up Amplify logging`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Setting up Amplify logging`
 };
 
 import commonRoute from '/src/fragments/lib/logging/common/setup_logging/setup_logging.mdx';
diff --git a/src/pages/lib/predictions/escapehatch/q/platform/[platform].mdx b/src/pages/lib/predictions/escapehatch/q/platform/[platform].mdx
index 2c09dc4f729..c313a23bc46 100644
--- a/src/pages/lib/predictions/escapehatch/q/platform/[platform].mdx
+++ b/src/pages/lib/predictions/escapehatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
-  description: `For any of the AWS services behind predictions, you can use the SDK object to get access to any methods we are not calling on your behalf by using an escape hatch.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `For any of the AWS services behind predictions, you can use the SDK object to get access to any methods we are not calling on your behalf by using an escape hatch.`
 };
 
 import escapeIOS from '/src/fragments/lib/predictions/ios/escapehatch.mdx';
diff --git a/src/pages/lib/predictions/getting-started/q/platform/[platform].mdx b/src/pages/lib/predictions/getting-started/q/platform/[platform].mdx
index c067000ba34..fe1bd1390f4 100644
--- a/src/pages/lib/predictions/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/predictions/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `Get started with integrating ML capabilities into your application using Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Get started with integrating ML capabilities into your application using Amplify`
 };
 
 import gettingStartedJs from '/src/fragments/lib/predictions/js/getting-started.mdx';
diff --git a/src/pages/lib/predictions/identify-entity/q/platform/[platform].mdx b/src/pages/lib/predictions/identify-entity/q/platform/[platform].mdx
index 894e4bba949..52d48fb952e 100644
--- a/src/pages/lib/predictions/identify-entity/q/platform/[platform].mdx
+++ b/src/pages/lib/predictions/identify-entity/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Identify entities from images`,
-  description: `Learn more about how to identify entities from an image using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to identify entities from an image using Amplify.`
 };
 
 import identifyEntityJs from '/src/fragments/lib/predictions/js/identify-entity.mdx';
diff --git a/src/pages/lib/predictions/identify-text/q/platform/[platform].mdx b/src/pages/lib/predictions/identify-text/q/platform/[platform].mdx
index a6a9859c6cc..d70f7c7aa93 100644
--- a/src/pages/lib/predictions/identify-text/q/platform/[platform].mdx
+++ b/src/pages/lib/predictions/identify-text/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Identify text`,
-  description: `Learn more about how to identify text from images and documents in your application using AWS Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to identify text from images and documents in your application using AWS Amplify.`
 };
 
 import identifyTextJs from '/src/fragments/lib/predictions/js/identify-text.mdx';
diff --git a/src/pages/lib/predictions/interpret/q/platform/[platform].mdx b/src/pages/lib/predictions/interpret/q/platform/[platform].mdx
index 809e9e1cdce..276483482bb 100644
--- a/src/pages/lib/predictions/interpret/q/platform/[platform].mdx
+++ b/src/pages/lib/predictions/interpret/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Interpret sentiment`,
-  description: `Learn more about how to determine key phrases, sentiment, language, syntax, and entities from text using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to determine key phrases, sentiment, language, syntax, and entities from text using Amplify.`
 };
 
 import interpretJs from '/src/fragments/lib/predictions/js/interpret.mdx';
diff --git a/src/pages/lib/predictions/intro/q/platform/[platform].mdx b/src/pages/lib/predictions/intro/q/platform/[platform].mdx
index eb5144b1b5a..d7b1e18f98e 100644
--- a/src/pages/lib/predictions/intro/q/platform/[platform].mdx
+++ b/src/pages/lib/predictions/intro/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Overview`,
-  description: `The Predictions category enables you to integrate machine learning in your application without any prior machine learning experience. The Predictions category comes with built-in support for both online and offline use cases.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Predictions category enables you to integrate machine learning in your application without any prior machine learning experience. The Predictions category comes with built-in support for both online and offline use cases.`
 };
 
 import js0 from '/src/fragments/lib/predictions/js/intro.mdx';
diff --git a/src/pages/lib/predictions/label-image/q/platform/[platform].mdx b/src/pages/lib/predictions/label-image/q/platform/[platform].mdx
index 8a482d918a1..37368d88801 100644
--- a/src/pages/lib/predictions/label-image/q/platform/[platform].mdx
+++ b/src/pages/lib/predictions/label-image/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Label objects in image`,
-  description: `Learn more about how to detect labels in an image using Amplify. For example you can detect if an image has objects such as chairs, desks etc.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to detect labels in an image using Amplify. For example you can detect if an image has objects such as chairs, desks etc.`
 };
 
 import labelImageJs from '/src/fragments/lib/predictions/js/label-image.mdx';
diff --git a/src/pages/lib/predictions/sample/q/platform/[platform].mdx b/src/pages/lib/predictions/sample/q/platform/[platform].mdx
index cb914618507..ce6db88d4f0 100644
--- a/src/pages/lib/predictions/sample/q/platform/[platform].mdx
+++ b/src/pages/lib/predictions/sample/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Example`,
-  description: `Sample code for Amplify's predictions category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Sample code for Amplify's predictions category`
 };
 
 import sampleJs from '/src/fragments/lib/predictions/js/sample.mdx';
diff --git a/src/pages/lib/predictions/text-speech/q/platform/[platform].mdx b/src/pages/lib/predictions/text-speech/q/platform/[platform].mdx
index 643a9e2eb17..9368d058746 100644
--- a/src/pages/lib/predictions/text-speech/q/platform/[platform].mdx
+++ b/src/pages/lib/predictions/text-speech/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Text to speech`,
-  description: `Learn more about how to integrate text-to-speech capabilities into your application using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to integrate text-to-speech capabilities into your application using Amplify.`
 };
 
 import textSpeechJs from '/src/fragments/lib/predictions/js/text-speech.mdx';
diff --git a/src/pages/lib/predictions/transcribe/q/platform/[platform].mdx b/src/pages/lib/predictions/transcribe/q/platform/[platform].mdx
index 01e9ee17e90..712f40b11aa 100644
--- a/src/pages/lib/predictions/transcribe/q/platform/[platform].mdx
+++ b/src/pages/lib/predictions/transcribe/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Transcribe audio to text`,
-  description: `Learn more about how to transcribe audio to text (also known as speech-to-text) for your application using Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to transcribe audio to text (also known as speech-to-text) for your application using Amplify`
 };
 
 import transcribeJs from '/src/fragments/lib/predictions/js/transcribe.mdx';
diff --git a/src/pages/lib/predictions/translate/q/platform/[platform].mdx b/src/pages/lib/predictions/translate/q/platform/[platform].mdx
index fc89d33d581..6c926b44328 100644
--- a/src/pages/lib/predictions/translate/q/platform/[platform].mdx
+++ b/src/pages/lib/predictions/translate/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Translate language`,
-  description: `Learn more about how to integrate translation capabilities for your application using Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to integrate translation capabilities for your application using Amplify`
 };
 
 import translateJs from '/src/fragments/lib/predictions/js/translate.mdx';
diff --git a/src/pages/lib/project-setup/async/q/platform/[platform].mdx b/src/pages/lib/project-setup/async/q/platform/[platform].mdx
index cb1ad3bad24..ade2e43826c 100644
--- a/src/pages/lib/project-setup/async/q/platform/[platform].mdx
+++ b/src/pages/lib/project-setup/async/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Async Programming Model`,
-  description: `Amplify Android uses an asynchronous programming model.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Amplify Android uses an asynchronous programming model.`
 };
 
 import android0 from '/src/fragments/lib/project-setup/android/async/async.mdx';
diff --git a/src/pages/lib/project-setup/combine/q/platform/[platform].mdx b/src/pages/lib/project-setup/combine/q/platform/[platform].mdx
index 4bec33338a6..bec19e3dc1a 100644
--- a/src/pages/lib/project-setup/combine/q/platform/[platform].mdx
+++ b/src/pages/lib/project-setup/combine/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Using Combine with Amplify`,
   description: `Amplify's support for Apple's Combine framework`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/project-setup/ios/combine/combine.mdx";
diff --git a/src/pages/lib/project-setup/coroutines/q/platform/[platform].mdx b/src/pages/lib/project-setup/coroutines/q/platform/[platform].mdx
index 2291bc671a8..5fff1f5585d 100644
--- a/src/pages/lib/project-setup/coroutines/q/platform/[platform].mdx
+++ b/src/pages/lib/project-setup/coroutines/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Kotlin Coroutines Support`,
   description: `Amplify Android includes first-class support for Kotlin Coroutines and Flows.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android0 from "/src/fragments/lib/project-setup/android/coroutines/coroutines.mdx";
diff --git a/src/pages/lib/project-setup/create-application/q/platform/[platform].mdx b/src/pages/lib/project-setup/create-application/q/platform/[platform].mdx
index f3a1773a69b..71c295cc128 100644
--- a/src/pages/lib/project-setup/create-application/q/platform/[platform].mdx
+++ b/src/pages/lib/project-setup/create-application/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Create your application`,
-  description: `Project setup for Amplify prior to adding category specific example.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Project setup for Amplify prior to adding category specific example.`
 };
 
 import ios0 from '/src/fragments/lib/project-setup/native_common/create-application/common.mdx';
diff --git a/src/pages/lib/project-setup/escape-hatch/q/platform/[platform].mdx b/src/pages/lib/project-setup/escape-hatch/q/platform/[platform].mdx
index fb4afaf33ec..6b12251a858 100644
--- a/src/pages/lib/project-setup/escape-hatch/q/platform/[platform].mdx
+++ b/src/pages/lib/project-setup/escape-hatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
   description: `Advanced use cases in Amplify Flutter`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import flutter from "/src/fragments/lib/project-setup/flutter/escape-hatch/escape-hatch.mdx";
diff --git a/src/pages/lib/project-setup/platform-setup/q/platform/[platform].mdx b/src/pages/lib/project-setup/platform-setup/q/platform/[platform].mdx
index 1dd7794b44f..6147bc8ce82 100644
--- a/src/pages/lib/project-setup/platform-setup/q/platform/[platform].mdx
+++ b/src/pages/lib/project-setup/platform-setup/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Platform Setup`,
-  description: `Instructions for platform-specific configurations needed for amplify-flutter`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Instructions for platform-specific configurations needed for amplify-flutter`
 };
 
 import flutter0 from '/src/fragments/lib/project-setup/flutter/platform-setup/platform-setup.mdx';
diff --git a/src/pages/lib/project-setup/prereq/q/platform/[platform].mdx b/src/pages/lib/project-setup/prereq/q/platform/[platform].mdx
index 49c6f3f2c54..8109eb0b516 100644
--- a/src/pages/lib/project-setup/prereq/q/platform/[platform].mdx
+++ b/src/pages/lib/project-setup/prereq/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Prerequisites`,
-  description: `Project Setup with Amplify - Prerequisites`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Project Setup with Amplify - Prerequisites`
 };
 
 import ios0 from '/src/fragments/lib/project-setup/native_common/prereq/common_header.mdx';
diff --git a/src/pages/lib/project-setup/rxjava/q/platform/[platform].mdx b/src/pages/lib/project-setup/rxjava/q/platform/[platform].mdx
index af34904362f..d99b684cd92 100644
--- a/src/pages/lib/project-setup/rxjava/q/platform/[platform].mdx
+++ b/src/pages/lib/project-setup/rxjava/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Using RxJava with Amplify`,
   description: `Amplify Android has first-class support for Reactive Extensions / RxJava.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android0 from "/src/fragments/lib/project-setup/android/rxjava/rxjava.mdx";
diff --git a/src/pages/lib/project-setup/upgrade-guide/q/platform/[platform].mdx b/src/pages/lib/project-setup/upgrade-guide/q/platform/[platform].mdx
index 48c581b7aed..e79feeb2006 100644
--- a/src/pages/lib/project-setup/upgrade-guide/q/platform/[platform].mdx
+++ b/src/pages/lib/project-setup/upgrade-guide/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Upgrade Guide`,
   description: `Guide to upgrade Amplify version from the last major version`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/project-setup/ios/upgrade-guide/upgrade-guide.mdx";
diff --git a/src/pages/lib/project-setup/use-existing-resources/q/platform/[platform].mdx b/src/pages/lib/project-setup/use-existing-resources/q/platform/[platform].mdx
index 1947d9ff2e5..4f144d95894 100644
--- a/src/pages/lib/project-setup/use-existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib/project-setup/use-existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing AWS resources`,
   description: `Add existing AWS resources to an application without the CLI.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/project-setup/ios/use-existing-resources/use-existing-resources.mdx";
diff --git a/src/pages/lib/pubsub/getting-started/q/platform/[platform].mdx b/src/pages/lib/pubsub/getting-started/q/platform/[platform].mdx
index 762004a7ba6..8ff2035adb2 100644
--- a/src/pages/lib/pubsub/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/pubsub/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `The AWS Amplify PubSub category provides connectivity with cloud-based message-oriented middleware. You can use PubSub to pass messages between your app instances and your app’s backend creating real-time interactive experiences.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The AWS Amplify PubSub category provides connectivity with cloud-based message-oriented middleware. You can use PubSub to pass messages between your app instances and your app’s backend creating real-time interactive experiences.`
 };
 
 import pubsubGettingStarted from '/src/fragments/lib/pubsub/js/getting-started.mdx';
diff --git a/src/pages/lib/pubsub/publish/q/platform/[platform].mdx b/src/pages/lib/pubsub/publish/q/platform/[platform].mdx
index d0adb63f858..3bf7c78d780 100644
--- a/src/pages/lib/pubsub/publish/q/platform/[platform].mdx
+++ b/src/pages/lib/pubsub/publish/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Publish`,
-  description: `Learn more about how to publish a message using the PubSub category in Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to publish a message using the PubSub category in Amplify`
 };
 
 import js0 from '/src/fragments/lib/pubsub/js/publish.mdx';
diff --git a/src/pages/lib/pubsub/subunsub/q/platform/[platform].mdx b/src/pages/lib/pubsub/subunsub/q/platform/[platform].mdx
index cd378db0551..532ae9024c4 100644
--- a/src/pages/lib/pubsub/subunsub/q/platform/[platform].mdx
+++ b/src/pages/lib/pubsub/subunsub/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Subscribe & Unsubscribe`,
-  description: `Learn more about how to subscribe to and unsubscribe from topics using Amplify's PubSub category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to subscribe to and unsubscribe from topics using Amplify's PubSub category`
 };
 
 import js0 from '/src/fragments/lib/pubsub/js/subunsub.mdx';
diff --git a/src/pages/lib/push-notifications/app-badge-count/q/platform/[platform].mdx b/src/pages/lib/push-notifications/app-badge-count/q/platform/[platform].mdx
index 81601f116ab..678f1b30f8c 100644
--- a/src/pages/lib/push-notifications/app-badge-count/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/app-badge-count/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `App badge count`,
-  description: `Get and set the application badge count.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Get and set the application badge count.`
 };
 
 import commonRoute from '/src/fragments/lib/push-notifications/common/app-badge-count.mdx';
diff --git a/src/pages/lib/push-notifications/enable-rich-notifications/q/platform/[platform].mdx b/src/pages/lib/push-notifications/enable-rich-notifications/q/platform/[platform].mdx
index 333219ef372..35f9dc22236 100644
--- a/src/pages/lib/push-notifications/enable-rich-notifications/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/enable-rich-notifications/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Enable rich notifications`,
-  description: `Enable rich notifications for you app.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Enable rich notifications for you app.`
 };
 
 import commonRoute from '/src/fragments/lib/push-notifications/common/enable-rich-notifications.mdx';
diff --git a/src/pages/lib/push-notifications/getting-started/q/platform/[platform].mdx b/src/pages/lib/push-notifications/getting-started/q/platform/[platform].mdx
index 279787629ee..21ddf016ba4 100644
--- a/src/pages/lib/push-notifications/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `Use of Amplify Push Notifications`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Use of Amplify Push Notifications`
 };
 
 import commonRoute from '/src/fragments/lib/push-notifications/common/getting_started/getting-started.mdx';
diff --git a/src/pages/lib/push-notifications/identify-user/q/platform/[platform].mdx b/src/pages/lib/push-notifications/identify-user/q/platform/[platform].mdx
index 10382b209bf..39cd3a2ae77 100644
--- a/src/pages/lib/push-notifications/identify-user/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/identify-user/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Identify user to Amazon Pinpoint`,
-  description: `Provide information about a user to Amazon Pinpoint.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Provide information about a user to Amazon Pinpoint.`
 };
 
 import commonRoute from '/src/fragments/lib/push-notifications/common/identify-user.mdx';
diff --git a/src/pages/lib/push-notifications/interact-with-notifications/q/platform/[platform].mdx b/src/pages/lib/push-notifications/interact-with-notifications/q/platform/[platform].mdx
index 1721e3e4f7a..56260a5b6e1 100644
--- a/src/pages/lib/push-notifications/interact-with-notifications/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/interact-with-notifications/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Interact with notifications`,
-  description: `Interact with push notifications through various events.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Interact with push notifications through various events.`
 };
 
 import commonRoute from '/src/fragments/lib/push-notifications/common/interact_with_notifications/interact-with-notifications.mdx';
diff --git a/src/pages/lib/push-notifications/migrate-from-previous-version/q/platform/[platform].mdx b/src/pages/lib/push-notifications/migrate-from-previous-version/q/platform/[platform].mdx
index a9afca07c02..23dcfd11b7d 100644
--- a/src/pages/lib/push-notifications/migrate-from-previous-version/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/migrate-from-previous-version/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Migrate from previous version`,
-  description: `Migrate from the deprecated to the new version of Amplify Push Notifications.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Migrate from the deprecated to the new version of Amplify Push Notifications.`
 };
 
 import reactNativeRoute from '/src/fragments/lib/push-notifications/react-native/migrate-from-previous-version.mdx';
diff --git a/src/pages/lib/push-notifications/receive-device-token/q/platform/[platform].mdx b/src/pages/lib/push-notifications/receive-device-token/q/platform/[platform].mdx
index 6989f825ebf..ea89f9d9d25 100644
--- a/src/pages/lib/push-notifications/receive-device-token/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/receive-device-token/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Receive device token`,
-  description: `Receive a device token for use with push notifications.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Receive a device token for use with push notifications.`
 };
 
 import commonRoute from '/src/fragments/lib/push-notifications/common/receive-device-token.mdx';
diff --git a/src/pages/lib/push-notifications/record-notifications/q/platform/[platform].mdx b/src/pages/lib/push-notifications/record-notifications/q/platform/[platform].mdx
index f378912170c..7d581b51c8a 100644
--- a/src/pages/lib/push-notifications/record-notifications/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/record-notifications/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Record notification events`,
   description: `Record Notification events with the Amazon Pinpoint service.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android0 from "/src/fragments/lib/push-notifications/android//record_notifications/10_handle_notification_received.mdx";
diff --git a/src/pages/lib/push-notifications/register-device/q/platform/[platform].mdx b/src/pages/lib/push-notifications/register-device/q/platform/[platform].mdx
index 0d0a0c5513e..039a3da1b85 100644
--- a/src/pages/lib/push-notifications/register-device/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/register-device/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Register device`,
   description: `Register a device with the push notification service and Amazon Pinpoint.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android0 from "/src/fragments/lib/push-notifications/common/register-device.mdx";
diff --git a/src/pages/lib/push-notifications/remote-media/q/platform/[platform].mdx b/src/pages/lib/push-notifications/remote-media/q/platform/[platform].mdx
index 30d98fbf4dc..6bb8efec86f 100644
--- a/src/pages/lib/push-notifications/remote-media/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/remote-media/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Remote media`,
   description: `Support remote media.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/push-notifications/common/remote-media.mdx";
diff --git a/src/pages/lib/push-notifications/request-permissions/q/platform/[platform].mdx b/src/pages/lib/push-notifications/request-permissions/q/platform/[platform].mdx
index ad1c9035234..de0ce9f47ba 100644
--- a/src/pages/lib/push-notifications/request-permissions/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/request-permissions/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Request permissions`,
-  description: `Request permissions to display push notifications to users.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Request permissions to display push notifications to users.`
 };
 
 import commonRoute from '/src/fragments/lib/push-notifications/common/request-permissions.mdx';
diff --git a/src/pages/lib/push-notifications/setup-push-service/q/platform/[platform].mdx b/src/pages/lib/push-notifications/setup-push-service/q/platform/[platform].mdx
index 85f99e05afc..cfc0a6f8c98 100644
--- a/src/pages/lib/push-notifications/setup-push-service/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/setup-push-service/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Setting up push notification services`,
-  description: `Learn how to setup the various push notification services for your mobile app.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn how to setup the various push notification services for your mobile app.`
 };
 
 import commonRoute from '/src/fragments/lib/push-notifications/common/setup_push_service/setup-push-service.mdx';
diff --git a/src/pages/lib/push-notifications/testing/q/platform/[platform].mdx b/src/pages/lib/push-notifications/testing/q/platform/[platform].mdx
index db54e32011b..fcf608614e0 100644
--- a/src/pages/lib/push-notifications/testing/q/platform/[platform].mdx
+++ b/src/pages/lib/push-notifications/testing/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Testing`,
-  description: `Overview of testing your push notifications`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Overview of testing your push notifications`
 };
 
 import commonRoute from '/src/fragments/lib/push-notifications/common/testing.mdx';
diff --git a/src/pages/lib/q/platform/[platform].mdx b/src/pages/lib/q/platform/[platform].mdx
index dafa0b23898..aedf6864ad5 100644
--- a/src/pages/lib/q/platform/[platform].mdx
+++ b/src/pages/lib/q/platform/[platform].mdx
@@ -3,25 +3,7 @@ export const meta = {
   description:
     'The Amplify open-source client libraries provide use-case centric, opinionated, declarative, and easy-to-use interfaces across different categories of cloud powered operations enabling mobile and web developers to easily interact with their backends. ',
   disableTOC: 'true',
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  filterKey: 'platform'
 };
 
 The Amplify open-source client libraries provide use-case centric, and easy-to-use interfaces across different categories of AWS cloud powered operations enabling mobile and web developers to easily interact with their backends. The Amplify libraries can be used with both new backends created using the Amplify CLI or existing backend resources.
@@ -44,4 +26,4 @@ import js3 from '/src/fragments/lib/js.mdx';
 
 import reactnative4 from '/src/fragments/lib/reactnative.mdx';
 
-<Fragments fragments={{ 'react-native': reactnative4 }} />
+<Fragments fragments={{ 'react-native': reactnative4 }} />
\ No newline at end of file
diff --git a/src/pages/lib/restapi/authz/q/platform/[platform].mdx b/src/pages/lib/restapi/authz/q/platform/[platform].mdx
index 21c9db558c6..5095402fa24 100644
--- a/src/pages/lib/restapi/authz/q/platform/[platform].mdx
+++ b/src/pages/lib/restapi/authz/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Define authorization rules`,
-  description: `Learn more about how to define authorization rules for Amplify's REST API capabilities`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to define authorization rules for Amplify's REST API capabilities`
 };
 
 import js0 from '/src/fragments/lib/restapi/js/authz.mdx';
diff --git a/src/pages/lib/restapi/cancel/q/platform/[platform].mdx b/src/pages/lib/restapi/cancel/q/platform/[platform].mdx
index 194bf656ed5..5a35c7db26b 100644
--- a/src/pages/lib/restapi/cancel/q/platform/[platform].mdx
+++ b/src/pages/lib/restapi/cancel/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Cancel API requests`,
-  description: `Using the Cancel API in Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Using the Cancel API in Amplify`
 };
 
 import js0 from '/src/fragments/lib/restapi/js/cancel.mdx';
diff --git a/src/pages/lib/restapi/delete/q/platform/[platform].mdx b/src/pages/lib/restapi/delete/q/platform/[platform].mdx
index 266ad28ae24..7f154f122a0 100644
--- a/src/pages/lib/restapi/delete/q/platform/[platform].mdx
+++ b/src/pages/lib/restapi/delete/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Deleting data`,
-  description: `Using the Delete API REST in Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Using the Delete API REST in Amplify`
 };
 
 import js0 from '/src/fragments/lib/restapi/js/delete.mdx';
diff --git a/src/pages/lib/restapi/existing-resources/q/platform/[platform].mdx b/src/pages/lib/restapi/existing-resources/q/platform/[platform].mdx
index 86da2cc9bf3..3c6ad813ec7 100644
--- a/src/pages/lib/restapi/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib/restapi/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing AWS resources`,
   description: `Configure the Amplify Libraries to use existing Amazon API Gateway resources by referencing them in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android0 from "/src/fragments/lib/restapi/existing-resources.mdx";
diff --git a/src/pages/lib/restapi/fetch/q/platform/[platform].mdx b/src/pages/lib/restapi/fetch/q/platform/[platform].mdx
index 19c65291341..ab0f972af51 100644
--- a/src/pages/lib/restapi/fetch/q/platform/[platform].mdx
+++ b/src/pages/lib/restapi/fetch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Fetching data`,
-  description: `Using the GET API REST in Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Using the GET API REST in Amplify`
 };
 
 import js0 from '/src/fragments/lib/restapi/js/fetch.mdx';
diff --git a/src/pages/lib/restapi/getting-started/q/platform/[platform].mdx b/src/pages/lib/restapi/getting-started/q/platform/[platform].mdx
index 458df65f642..057d124262f 100644
--- a/src/pages/lib/restapi/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/restapi/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `The API category provides a solution for making HTTP requests to REST and GraphQL endpoints. The REST API category can be used for creating signed requests against Amazon API Gateway when the API Gateway Authorization is set to AWS_IAM.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The API category provides a solution for making HTTP requests to REST and GraphQL endpoints. The REST API category can be used for creating signed requests against Amazon API Gateway when the API Gateway Authorization is set to AWS_IAM.`
 };
 
 import js0 from '/src/fragments/lib/restapi/js/getting-started.mdx';
diff --git a/src/pages/lib/restapi/update/q/platform/[platform].mdx b/src/pages/lib/restapi/update/q/platform/[platform].mdx
index f5e14aeb619..d434eea5cc7 100644
--- a/src/pages/lib/restapi/update/q/platform/[platform].mdx
+++ b/src/pages/lib/restapi/update/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Updating data`,
-  description: `Using Post, Put, etc. in Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Using Post, Put, etc. in Amplify`
 };
 
 import js0 from '/src/fragments/lib/restapi/js/update.mdx';
diff --git a/src/pages/lib/ssr/q/platform/[platform].mdx b/src/pages/lib/ssr/q/platform/[platform].mdx
index 48c4bd1c494..b1350b85621 100644
--- a/src/pages/lib/ssr/q/platform/[platform].mdx
+++ b/src/pages/lib/ssr/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting Started with Server-Side Rendering (SSR)`,
   description: `Getting Started with Server-Side Rendering (SSR)`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/ssr/js/getting-started.mdx";
diff --git a/src/pages/lib/storage/autotrack/q/platform/[platform].mdx b/src/pages/lib/storage/autotrack/q/platform/[platform].mdx
index 666a1a10cf0..2217678a9ac 100644
--- a/src/pages/lib/storage/autotrack/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/autotrack/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Automatically track events`,
-  description: `You can enable automatic tracking of Storage Events such as uploads and downloads. Enabling this will automatically send Storage Events to Amazon Pinpoint and you will be able to see them within the AWS Pinpoint Console under Custom Events. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `You can enable automatic tracking of Storage Events such as uploads and downloads. Enabling this will automatically send Storage Events to Amazon Pinpoint and you will be able to see them within the AWS Pinpoint Console under Custom Events. `
 };
 
 import js0 from '/src/fragments/lib/storage/js/autotrack.mdx';
diff --git a/src/pages/lib/storage/cancel-requests/q/platform/[platform].mdx b/src/pages/lib/storage/cancel-requests/q/platform/[platform].mdx
index 32c5fba3ef8..97961f13c11 100644
--- a/src/pages/lib/storage/cancel-requests/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/cancel-requests/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Cancel requests`,
-  description: `Cancel an in-flight get or put requests from Storage`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Cancel an in-flight get or put requests from Storage`
 };
 
 import js0 from '/src/fragments/lib/storage/js/cancel-requests.mdx';
diff --git a/src/pages/lib/storage/configureaccess/q/platform/[platform].mdx b/src/pages/lib/storage/configureaccess/q/platform/[platform].mdx
index 7d902d3b2a6..16a8c6639a0 100644
--- a/src/pages/lib/storage/configureaccess/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/configureaccess/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `File access levels`,
-  description: `Learn about configuring different access levels in Amplify Storage. Objects can be public, protected, or private.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn about configuring different access levels in Amplify Storage. Objects can be public, protected, or private.`
 };
 
 import js0 from '/src/fragments/lib/storage/js/configureaccess.mdx';
diff --git a/src/pages/lib/storage/copy/q/platform/[platform].mdx b/src/pages/lib/storage/copy/q/platform/[platform].mdx
index 75dd7ec0d5e..c04803272cb 100644
--- a/src/pages/lib/storage/copy/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/copy/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Copy files`,
-  description: `Learn more about how to copy files using Amplify's storage category.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to copy files using Amplify's storage category.`
 };
 
 import js0 from '/src/fragments/lib/storage/js/copy.mdx';
diff --git a/src/pages/lib/storage/custom-plugin/q/platform/[platform].mdx b/src/pages/lib/storage/custom-plugin/q/platform/[platform].mdx
index 04a11cd8311..d0388b7b60e 100644
--- a/src/pages/lib/storage/custom-plugin/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/custom-plugin/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Custom Plugin`,
-  description: `Learn more about how to create your own custom plugin.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to create your own custom plugin.`
 };
 
 import js0 from '/src/fragments/lib/storage/js/create-custom-plugin.mdx';
diff --git a/src/pages/lib/storage/download/q/platform/[platform].mdx b/src/pages/lib/storage/download/q/platform/[platform].mdx
index d6ee20d9380..ae57cd11aa6 100644
--- a/src/pages/lib/storage/download/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/download/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Download files`,
-  description: `Learn more about how to download / retrieve files using the Storage category of Amplify`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to download / retrieve files using the Storage category of Amplify`
 };
 
 import js0 from '/src/fragments/lib/storage/js/download.mdx';
diff --git a/src/pages/lib/storage/escapehatch/q/platform/[platform].mdx b/src/pages/lib/storage/escapehatch/q/platform/[platform].mdx
index 0a7c365c90d..059cc709c98 100644
--- a/src/pages/lib/storage/escapehatch/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/escapehatch/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Escape hatch`,
   description: `For specialized use cases where Amplify does not provide the functionality, you can use the escape hatch to access an AWSS3 low-level client instance. The returned AWSS3 instance is already configured with your access credentials.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/lib/storage/ios/escapehatch.mdx";
diff --git a/src/pages/lib/storage/existing-resources/q/platform/[platform].mdx b/src/pages/lib/storage/existing-resources/q/platform/[platform].mdx
index c46da97b4c5..564a6b3fe5e 100644
--- a/src/pages/lib/storage/existing-resources/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/existing-resources/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use existing AWS resources`,
-  description: `Configure the Amplify Libraries to use an existing Amazon S3 bucket by referencing it in your configuration.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Configure the Amplify Libraries to use an existing Amazon S3 bucket by referencing it in your configuration.`
 };
 
 import js0 from '/src/fragments/lib/storage/js/existing-resources.mdx';
diff --git a/src/pages/lib/storage/get-properties/q/platform/[platform].mdx b/src/pages/lib/storage/get-properties/q/platform/[platform].mdx
index 6f8c63ebb24..508b3abd912 100644
--- a/src/pages/lib/storage/get-properties/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/get-properties/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Get file properties`,
-  description: `Learn more about how to get a file's properties without downloading the file using Amplify's storage category.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to get a file's properties without downloading the file using Amplify's storage category.`
 };
 
 import js0 from '/src/fragments/lib/storage/js/get-properties.mdx';
diff --git a/src/pages/lib/storage/getting-started/q/platform/[platform].mdx b/src/pages/lib/storage/getting-started/q/platform/[platform].mdx
index 5fc5f2c26d0..2011cf87838 100644
--- a/src/pages/lib/storage/getting-started/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
-  description: `The Amplify Storage category provides a simple mechanism for managing user content for your app in public, protected, or private storage buckets. The Amplify AWS S3 Storage plugin leverages Amazon S3.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amplify Storage category provides a simple mechanism for managing user content for your app in public, protected, or private storage buckets. The Amplify AWS S3 Storage plugin leverages Amazon S3.`
 };
 
 import js0 from '/src/fragments/lib/storage/js/getting-started.mdx';
diff --git a/src/pages/lib/storage/list/q/platform/[platform].mdx b/src/pages/lib/storage/list/q/platform/[platform].mdx
index 479f59de056..a08ead0edbd 100644
--- a/src/pages/lib/storage/list/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/list/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `List files`,
-  description: `Learn more about how to list all of the uploaded objects using Amplify's storage category.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to list all of the uploaded objects using Amplify's storage category.`
 };
 
 import js0 from '/src/fragments/lib/storage/js/list.mdx';
diff --git a/src/pages/lib/storage/move/q/platform/[platform].mdx b/src/pages/lib/storage/move/q/platform/[platform].mdx
index e54f533d0a4..980966bc185 100644
--- a/src/pages/lib/storage/move/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/move/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Move files`,
-  description: `Learn more about how to move files using Amplify's storage category.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to move files using Amplify's storage category.`
 };
 
 import flutter0 from '/src/fragments/lib/storage/flutter/move.mdx';
diff --git a/src/pages/lib/storage/overview/q/platform/[platform].mdx b/src/pages/lib/storage/overview/q/platform/[platform].mdx
index 22ef81958b4..802465b0094 100644
--- a/src/pages/lib/storage/overview/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/overview/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Concepts`,
   description: `Learn more about the foundational storage concepts for cloud-based application and how they work with Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 AWS Amplify storage module provides a simple mechanism for managing user content for your app in public, protected or private storage buckets. The storage category comes with built-in support for [Amazon S3 (Simple Storage Service)](https://docs.aws.amazon.com/AmazonS3/latest/dev/Welcome.html). 
diff --git a/src/pages/lib/storage/querytransfers/q/platform/[platform].mdx b/src/pages/lib/storage/querytransfers/q/platform/[platform].mdx
index 408b7df0065..41e84b3d503 100644
--- a/src/pages/lib/storage/querytransfers/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/querytransfers/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Query Transfer`,
-  description: `Learn more about how to query enqueued transfers from the local database using Amplify's storage category.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to query enqueued transfers from the local database using Amplify's storage category.`
 };
 
 import android0 from '/src/fragments/lib/storage/android/query-transfers.mdx';
diff --git a/src/pages/lib/storage/remove/q/platform/[platform].mdx b/src/pages/lib/storage/remove/q/platform/[platform].mdx
index 74974d517f5..40034d06812 100644
--- a/src/pages/lib/storage/remove/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/remove/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Remove files`,
-  description: `Learn more about how to remove files using Amplify's storage category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to remove files using Amplify's storage category`
 };
 
 import js0 from '/src/fragments/lib/storage/js/remove.mdx';
diff --git a/src/pages/lib/storage/transfer-acceleration/q/platform/[platform].mdx b/src/pages/lib/storage/transfer-acceleration/q/platform/[platform].mdx
index 7194db04b21..1040e27195c 100644
--- a/src/pages/lib/storage/transfer-acceleration/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/transfer-acceleration/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Use Transfer Acceleration`,
   description: `How to enable and use S3's Transfer Acceleration on your S3 bucket`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js from "/src/fragments/lib/storage/js/transfer-acceleration.mdx";
diff --git a/src/pages/lib/storage/triggers/q/platform/[platform].mdx b/src/pages/lib/storage/triggers/q/platform/[platform].mdx
index 7e3e5bb32d7..1a719d05cfc 100644
--- a/src/pages/lib/storage/triggers/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/triggers/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Lambda triggers`,
   description: `Learn more about how to enable triggers for the Storage Category with Amazon S3 & Amazon DynamoDB as Providers. The CLI supports associating Lambda triggers with S3 and DynamoDB events. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 If you are looking to enable triggers for the Storage Category with Amazon S3 & Amazon DynamoDB as Providers, the CLI supports associating Lambda triggers with S3 and DynamoDB events. For example, this can be useful for a use case where you want to invoke a Lambda function after a create or update operation on a DynamoDB table managed by the Amplify CLI. 
diff --git a/src/pages/lib/storage/upload/q/platform/[platform].mdx b/src/pages/lib/storage/upload/q/platform/[platform].mdx
index b71c9f37cea..5f6bc712245 100644
--- a/src/pages/lib/storage/upload/q/platform/[platform].mdx
+++ b/src/pages/lib/storage/upload/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Upload files`,
-  description: `Learn more about how to upload files using Amplify's storage category`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Learn more about how to upload files using Amplify's storage category`
 };
 
 import js0 from '/src/fragments/lib/storage/js/upload.mdx';
diff --git a/src/pages/lib/troubleshooting/strict-mode/q/platform/[platform].mdx b/src/pages/lib/troubleshooting/strict-mode/q/platform/[platform].mdx
index e903b0327ef..53aac410435 100644
--- a/src/pages/lib/troubleshooting/strict-mode/q/platform/[platform].mdx
+++ b/src/pages/lib/troubleshooting/strict-mode/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Typescript Strict Mode `,
-  description: `Typescript Strict Mode `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Typescript Strict Mode `
 };
 
 import js0 from '/src/fragments/lib/troubleshooting/js/strict-mode.mdx';
diff --git a/src/pages/lib/troubleshooting/upgrading/q/platform/[platform].mdx b/src/pages/lib/troubleshooting/upgrading/q/platform/[platform].mdx
index 284bbb2bcf4..d052140a27c 100644
--- a/src/pages/lib/troubleshooting/upgrading/q/platform/[platform].mdx
+++ b/src/pages/lib/troubleshooting/upgrading/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Upgrading Amplify packages  `,
-  description: `Upgrading Amplify packages `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Upgrading Amplify packages `
 };
 
 import js0 from '/src/fragments/lib/troubleshooting/js/upgrading.mdx';
diff --git a/src/pages/lib/utilities/cache/q/platform/[platform].mdx b/src/pages/lib/utilities/cache/q/platform/[platform].mdx
index 6307cef63a8..c6706943415 100644
--- a/src/pages/lib/utilities/cache/q/platform/[platform].mdx
+++ b/src/pages/lib/utilities/cache/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Cache`,
-  description: `The Amplify Cache module provides a generic LRU cache for JavaScript developers to store data with priority and expiration settings.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The Amplify Cache module provides a generic LRU cache for JavaScript developers to store data with priority and expiration settings.`
 };
 
 import js0 from '/src/fragments/lib/utilities/cache.mdx';
diff --git a/src/pages/lib/utilities/hub/q/platform/[platform].mdx b/src/pages/lib/utilities/hub/q/platform/[platform].mdx
index f4608a6abd6..e5180356612 100644
--- a/src/pages/lib/utilities/hub/q/platform/[platform].mdx
+++ b/src/pages/lib/utilities/hub/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Hub`,
-  description: `Amplify has a local eventing system called Hub. It is a lightweight implementation of Publisher-Subscriber pattern, and is used to share data between modules and components in your app. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Amplify has a local eventing system called Hub. It is a lightweight implementation of Publisher-Subscriber pattern, and is used to share data between modules and components in your app. `
 };
 
 import js0 from '/src/fragments/lib/utilities/js/hub.mdx';
diff --git a/src/pages/lib/utilities/i18n/q/platform/[platform].mdx b/src/pages/lib/utilities/i18n/q/platform/[platform].mdx
index 5246c76f90f..3f071f6761f 100644
--- a/src/pages/lib/utilities/i18n/q/platform/[platform].mdx
+++ b/src/pages/lib/utilities/i18n/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Internationalization`,
-  description: `The AWS Amplify I18n module is a lightweight internationalization solution.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `The AWS Amplify I18n module is a lightweight internationalization solution.`
 };
 
 import js0 from '/src/fragments/lib/utilities/i18n.mdx';
diff --git a/src/pages/lib/utilities/logger/q/platform/[platform].mdx b/src/pages/lib/utilities/logger/q/platform/[platform].mdx
index da0205b50c4..1c61ec6fc04 100644
--- a/src/pages/lib/utilities/logger/q/platform/[platform].mdx
+++ b/src/pages/lib/utilities/logger/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Logger`,
-  description: `AWS Amplify writes console logs through Logger. You can use Logger in your apps for the same purpose.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `AWS Amplify writes console logs through Logger. You can use Logger in your apps for the same purpose.`
 };
 
 import js0 from '/src/fragments/lib/utilities/logger.mdx';
diff --git a/src/pages/lib/utilities/serviceworker/q/platform/[platform].mdx b/src/pages/lib/utilities/serviceworker/q/platform/[platform].mdx
index 157fcc48128..7b7c9537d73 100644
--- a/src/pages/lib/utilities/serviceworker/q/platform/[platform].mdx
+++ b/src/pages/lib/utilities/serviceworker/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Service Worker`,
   description: `AWS Amplify ServiceWorker class enables registering a service worker in the browser and communicating with it via postMessage events, so that you can create rich offline experiences with Push APIs and analytics.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import js0 from "/src/fragments/lib/utilities/serviceworker.mdx";
diff --git a/src/pages/sdk/analytics/endpoints/q/platform/[platform].mdx b/src/pages/sdk/analytics/endpoints/q/platform/[platform].mdx
index 972feed5db9..26027ffcf3f 100644
--- a/src/pages/sdk/analytics/endpoints/q/platform/[platform].mdx
+++ b/src/pages/sdk/analytics/endpoints/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Endpoints`,
   description: `When a user starts a session (for example, by launching your mobile app), your mobile or web application can automatically register (or update) an endpoint with Amazon Pinpoint. The endpoint represents the device that the user starts the session with.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/analytics/events/q/platform/[platform].mdx b/src/pages/sdk/analytics/events/q/platform/[platform].mdx
index b1ece91fac5..7c157c15416 100644
--- a/src/pages/sdk/analytics/events/q/platform/[platform].mdx
+++ b/src/pages/sdk/analytics/events/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Events`,
   description: `You can use the AWS Android SDK for Pinpoint to report usage data, or events, to Amazon Pinpoint. You can report events to capture information such as session times, users’ purchasing behavior, sign-in attempts, or any custom event type that you need.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/analytics/getting-started/q/platform/[platform].mdx b/src/pages/sdk/analytics/getting-started/q/platform/[platform].mdx
index 656380dd2c3..2dc8a17d0b1 100644
--- a/src/pages/sdk/analytics/getting-started/q/platform/[platform].mdx
+++ b/src/pages/sdk/analytics/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting Started`,
   description: `Learn more about how to add analytics capabilities in your cloud-based application using AWS Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/analytics/kinesis/q/platform/[platform].mdx b/src/pages/sdk/analytics/kinesis/q/platform/[platform].mdx
index 78050e2700a..87335cd7769 100644
--- a/src/pages/sdk/analytics/kinesis/q/platform/[platform].mdx
+++ b/src/pages/sdk/analytics/kinesis/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Using Amazon Kinesis`,
   description: `Learn how to interface with Amazon Kinesis Data Streams and Amazon Kinesis Data Firehose to stream analytics data for real-time processing using Amplify.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/api/graphql/q/platform/[platform].mdx b/src/pages/sdk/api/graphql/q/platform/[platform].mdx
index 35181a253ba..1bcc5b57cb6 100644
--- a/src/pages/sdk/api/graphql/q/platform/[platform].mdx
+++ b/src/pages/sdk/api/graphql/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `GraphQL - Realtime and Offline`,
   description: `AWS AppSync helps you build data-driven apps with real-time and offline capabilities. The AppSync Android SDK enables you to integrate your app with the AWS AppSync service and is based off of the Apollo project found here.  `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/api/rest/q/platform/[platform].mdx b/src/pages/sdk/api/rest/q/platform/[platform].mdx
index 6e4dbd1e176..95374938003 100644
--- a/src/pages/sdk/api/rest/q/platform/[platform].mdx
+++ b/src/pages/sdk/api/rest/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `REST API`,
   description: `The API category will perform SDK code generation which, when used with the AWSMobileClient can be used for creating signed requests for Amazon API Gateway when the service Authorization is set to AWS_IAM or when using a Cognito User Pools Authorizer.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/auth/custom-auth-flow/q/platform/[platform].mdx b/src/pages/sdk/auth/custom-auth-flow/q/platform/[platform].mdx
index 62957fc72ce..f07f17b05dc 100644
--- a/src/pages/sdk/auth/custom-auth-flow/q/platform/[platform].mdx
+++ b/src/pages/sdk/auth/custom-auth-flow/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Custom auth flow`,
   description: `Learn how to customize the authentication flow with Amazon Cognito User Pools to enable custom challenge types, in addition to a password in order to verify the identity of users. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/auth/device-features/q/platform/[platform].mdx b/src/pages/sdk/auth/device-features/q/platform/[platform].mdx
index bbbfa9d6d40..807b8d752b8 100644
--- a/src/pages/sdk/auth/device-features/q/platform/[platform].mdx
+++ b/src/pages/sdk/auth/device-features/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Device features`,
   description: `You can use the device related features of Amazon Cognito UserPools by enabling the Devices features.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/auth/drop-in-auth/q/platform/[platform].mdx b/src/pages/sdk/auth/drop-in-auth/q/platform/[platform].mdx
index b750ee1a3cb..6a4dbb061c2 100644
--- a/src/pages/sdk/auth/drop-in-auth/q/platform/[platform].mdx
+++ b/src/pages/sdk/auth/drop-in-auth/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Drop-in auth`,
   description: `Learn how to use and customize AWSMobileClient's simple “drop-in” auth UI for your application. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/auth/federated-identities/q/platform/[platform].mdx b/src/pages/sdk/auth/federated-identities/q/platform/[platform].mdx
index 69c92957777..51bf4f55062 100644
--- a/src/pages/sdk/auth/federated-identities/q/platform/[platform].mdx
+++ b/src/pages/sdk/auth/federated-identities/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Federated identities`,
   description: `Federated Sign In can be used to obtain federated “Identity ID” using external providers. Learn how to setup external sign-in providers like SAML provider, Facebook, Google, Sign in with Apple. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/auth/getting-started/q/platform/[platform].mdx b/src/pages/sdk/auth/getting-started/q/platform/[platform].mdx
index ebd5fca54d4..38c36e4f919 100644
--- a/src/pages/sdk/auth/getting-started/q/platform/[platform].mdx
+++ b/src/pages/sdk/auth/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
   description: `Learn how to integrate auth capabilities into your mobile app with AWS Mobile SDK.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/auth/guest-access/q/platform/[platform].mdx b/src/pages/sdk/auth/guest-access/q/platform/[platform].mdx
index 74bb7d33cd1..5e104911dae 100644
--- a/src/pages/sdk/auth/guest-access/q/platform/[platform].mdx
+++ b/src/pages/sdk/auth/guest-access/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Guest access`,
   description: `Learn how to enable “Guest” or “Unauthenticated” UX in your application. This is provided out of the box with AWSMobileClient through the initialization routine you have added.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/auth/hosted-ui/q/platform/[platform].mdx b/src/pages/sdk/auth/hosted-ui/q/platform/[platform].mdx
index 449a2b9fa4c..7692b98bc97 100644
--- a/src/pages/sdk/auth/hosted-ui/q/platform/[platform].mdx
+++ b/src/pages/sdk/auth/hosted-ui/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Hosted UI`,
   description: `Amazon Cognito provides a customizable user experience via the Hosted UI. The Hosted UI is an OAuth 2.0 flow that allows you to launch a login screen without embedding an SDK for Cognito or a social provider into your application. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/auth/how-it-works/q/platform/[platform].mdx b/src/pages/sdk/auth/how-it-works/q/platform/[platform].mdx
index ccfcf9d08d3..9fb8dd2969d 100644
--- a/src/pages/sdk/auth/how-it-works/q/platform/[platform].mdx
+++ b/src/pages/sdk/auth/how-it-works/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Overview`,
   description: `The AWSMobileClient provides client APIs and building blocks for developers who want to create user authentication experiences. Learn more about how it works. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/auth/working-with-api/q/platform/[platform].mdx b/src/pages/sdk/auth/working-with-api/q/platform/[platform].mdx
index 3a9179fc6a7..7ea754506a2 100644
--- a/src/pages/sdk/auth/working-with-api/q/platform/[platform].mdx
+++ b/src/pages/sdk/auth/working-with-api/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Working with the API`,
   description: `Learn more about how to use Amplify's auth APIs  `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/configuration/setup-options/q/platform/[platform].mdx b/src/pages/sdk/configuration/setup-options/q/platform/[platform].mdx
index 4192c3b45d4..569cdc841f9 100644
--- a/src/pages/sdk/configuration/setup-options/q/platform/[platform].mdx
+++ b/src/pages/sdk/configuration/setup-options/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `SDK Setup Options`,
   description: `The AWS SDK contains high level client interfaces for quickly adding common features and functionality to your app. You can also manually add the generated AWS service interfaces for direct interaction if you have custom or advanced requirements.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/sdk/configuration/ios/setup-options.mdx";
diff --git a/src/pages/sdk/index.mdx b/src/pages/sdk/index.mdx
deleted file mode 100644
index 5a938aa842f..00000000000
--- a/src/pages/sdk/index.mdx
+++ /dev/null
@@ -1,12 +0,0 @@
-import ChooseFilterPage from '@/components/ChooseFilterPage';
-
-import { PLATFORM_FILTER_OPTIONS } from '@/utils/filter-data.ts';
-
-<ChooseFilterPage
-  directoryPath="/ChooseFilterPage"
-  address="/sdk"
-  filterKind="platform"
-  filters={PLATFORM_FILTER_OPTIONS}
-  currentFilter="all"
-  message={`Please select one of the following:`}
-/>
diff --git a/src/pages/sdk/info/app-uninstall/q/platform/[platform].mdx b/src/pages/sdk/info/app-uninstall/q/platform/[platform].mdx
index 5a06f323709..38c3e032c28 100644
--- a/src/pages/sdk/info/app-uninstall/q/platform/[platform].mdx
+++ b/src/pages/sdk/info/app-uninstall/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Uninstalling the app`,
   description: `Learn about the data that gets stored persistently on a device.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/sdk/info/native_common/app-uninstall/common.mdx";
diff --git a/src/pages/sdk/info/overview/q/platform/[platform].mdx b/src/pages/sdk/info/overview/q/platform/[platform].mdx
index dffa94abb55..6542cc57e84 100644
--- a/src/pages/sdk/info/overview/q/platform/[platform].mdx
+++ b/src/pages/sdk/info/overview/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Data Information`,
   description: `Information regarding the data collected by the library`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios0 from "/src/fragments/sdk/info/native_common/data-information/common.mdx";
diff --git a/src/pages/sdk/pubsub/aws-iot-and-amplify/q/platform/[platform].mdx b/src/pages/sdk/pubsub/aws-iot-and-amplify/q/platform/[platform].mdx
index 9efd4b8e988..7e1b40c4671 100644
--- a/src/pages/sdk/pubsub/aws-iot-and-amplify/q/platform/[platform].mdx
+++ b/src/pages/sdk/pubsub/aws-iot-and-amplify/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Using AWS IoT with Amplify`,
   description: `Learn how to use the AWS IoT capabilities in an application that uses the newest Amplify library.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import ios1 from "/src/fragments/sdk/pubsub/ios/aws-iot-and-amplify.mdx";
diff --git a/src/pages/sdk/pubsub/getting-started/q/platform/[platform].mdx b/src/pages/sdk/pubsub/getting-started/q/platform/[platform].mdx
index 658a8638ad9..efc61e24bec 100644
--- a/src/pages/sdk/pubsub/getting-started/q/platform/[platform].mdx
+++ b/src/pages/sdk/pubsub/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
   description: `Learn how to integrate connectivity with cloud-based message-oriented middleware using PubSub and AWS Mobile SDK. You can use PubSub to pass messages between your app instances and your app’s backend creating real-time interactive experiences.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/pubsub/working-api/q/platform/[platform].mdx b/src/pages/sdk/pubsub/working-api/q/platform/[platform].mdx
index e5b918ac725..3ffa453004f 100644
--- a/src/pages/sdk/pubsub/working-api/q/platform/[platform].mdx
+++ b/src/pages/sdk/pubsub/working-api/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Working with the API`,
   description: `Learn how to establish a connection, subscribe to a topic, publish to a topic, unsubscribe from a topic and close a connection with PubSub on AWS Mobile SDK.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/push-notifications/getting-started/q/platform/[platform].mdx b/src/pages/sdk/push-notifications/getting-started/q/platform/[platform].mdx
index c14a5070669..c657e052ac9 100644
--- a/src/pages/sdk/push-notifications/getting-started/q/platform/[platform].mdx
+++ b/src/pages/sdk/push-notifications/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
   description: `Enable your users to receive mobile push messages sent from the Apple (APNs) and Google (FCM/GCM) platforms. The Amplify CLI deploys your push notification backend using Amazon Pinpoint. You can also create Amazon Pinpoint campaigns that tie user behavior to push or other forms of messaging.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/push-notifications/messaging-campaign/q/platform/[platform].mdx b/src/pages/sdk/push-notifications/messaging-campaign/q/platform/[platform].mdx
index 3d9ccc826d4..6a19c2f9a4d 100644
--- a/src/pages/sdk/push-notifications/messaging-campaign/q/platform/[platform].mdx
+++ b/src/pages/sdk/push-notifications/messaging-campaign/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Messaging campaigns`,
   description: `Use AWS Mobile SDK and the Amazon Pinpoint console to target your app users with push messaging. You can send individual messages or configure campaigns that target a group of users that match a profile that you define.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/push-notifications/setup-push-service/q/platform/[platform].mdx b/src/pages/sdk/push-notifications/setup-push-service/q/platform/[platform].mdx
index a03434305a3..d036b66a163 100644
--- a/src/pages/sdk/push-notifications/setup-push-service/q/platform/[platform].mdx
+++ b/src/pages/sdk/push-notifications/setup-push-service/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Setting up push notification services`,
   description: `Learn how to setup the various push notification services for your mobile app.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/q/platform/[platform].mdx b/src/pages/sdk/q/platform/[platform].mdx
index 5d99541c90a..67784af4a24 100644
--- a/src/pages/sdk/q/platform/[platform].mdx
+++ b/src/pages/sdk/q/platform/[platform].mdx
@@ -1,26 +1,8 @@
 export const meta = {
   title: "AWS Mobile SDK",
   description: "The AWS Mobile SDK for Android enables you to build mobile apps by providing simplified APIs for AWS services such as Amazon Cognito, Amazon S3, AWS AppSync and more.",
-  disableTOC: "true",
   filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
+  disableTOC: "true",
 };
 
 import ios0 from "/src/fragments/lib/ios-sdk.mdx";
diff --git a/src/pages/sdk/storage/configure-access/q/platform/[platform].mdx b/src/pages/sdk/storage/configure-access/q/platform/[platform].mdx
index 20045aaa8c5..70219d941e1 100644
--- a/src/pages/sdk/storage/configure-access/q/platform/[platform].mdx
+++ b/src/pages/sdk/storage/configure-access/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Configure Access `,
   description: `description`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/storage/getting-started/q/platform/[platform].mdx b/src/pages/sdk/storage/getting-started/q/platform/[platform].mdx
index 042b28bfd47..c73ddbb560f 100644
--- a/src/pages/sdk/storage/getting-started/q/platform/[platform].mdx
+++ b/src/pages/sdk/storage/getting-started/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Getting started`,
   description: `Learn how to configure the data access level on your stored objects using AWS Mobile SDK.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/storage/graphql-api/q/platform/[platform].mdx b/src/pages/sdk/storage/graphql-api/q/platform/[platform].mdx
index d43d222965a..d54ab9829cf 100644
--- a/src/pages/sdk/storage/graphql-api/q/platform/[platform].mdx
+++ b/src/pages/sdk/storage/graphql-api/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Using GraphQL API`,
   description: `Learn how to upload and download Amazon S3 Objects using AWS AppSync, a GraphQL based solution to build data-driven apps with real-time and offline capabilities.`,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/sdk/storage/transfer-utility/q/platform/[platform].mdx b/src/pages/sdk/storage/transfer-utility/q/platform/[platform].mdx
index a6187a8259d..2626d691c1f 100644
--- a/src/pages/sdk/storage/transfer-utility/q/platform/[platform].mdx
+++ b/src/pages/sdk/storage/transfer-utility/q/platform/[platform].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Using TransferUtility`,
   description: `To make it easy to upload and download objects from Amazon S3, AWS Mobile SDK provides a TransferUtility component with built-in support for background transfers, progress tracking, and MultiPart uploads. `,
-  filterKey: "platform",
-  supportedPlatforms: PLATFORM_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { PLATFORM_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            platform: context.params.platform,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import all0 from "/src/fragments/sdk/library-callout.mdx";
diff --git a/src/pages/start/getting-started/add-api/q/integration/[integration].mdx b/src/pages/start/getting-started/add-api/q/integration/[integration].mdx
index e4483c0d2bc..efaa8b58fd8 100644
--- a/src/pages/start/getting-started/add-api/q/integration/[integration].mdx
+++ b/src/pages/start/getting-started/add-api/q/integration/[integration].mdx
@@ -1,25 +1,7 @@
 export const meta = {
   title: `Connect to the cloud`,
   description: `Getting Started with Amplify Libraries - how to add API and database to your app.`,
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
+  filterKey: `integration`,
 };
 
 import ios0 from "/src/fragments/start/getting-started/ios/add-api.mdx";
diff --git a/src/pages/start/getting-started/auth/q/integration/[integration].mdx b/src/pages/start/getting-started/auth/q/integration/[integration].mdx
index 0a047806742..b98260530ed 100644
--- a/src/pages/start/getting-started/auth/q/integration/[integration].mdx
+++ b/src/pages/start/getting-started/auth/q/integration/[integration].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Add authentication`,
-  description: `Getting Started with Amplify - how to add auth to your app`,
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
+  description: `Getting Started with Amplify - how to add auth to your app`
 };
 
 import react0 from '/src/fragments/start/getting-started/react/auth.mdx';
diff --git a/src/pages/start/getting-started/data-model/q/integration/[integration].mdx b/src/pages/start/getting-started/data-model/q/integration/[integration].mdx
index f90e7dde2ea..8ce1bad5b99 100644
--- a/src/pages/start/getting-started/data-model/q/integration/[integration].mdx
+++ b/src/pages/start/getting-started/data-model/q/integration/[integration].mdx
@@ -1,25 +1,7 @@
 export const meta = {
   title: `Connect API and database to the app`,
   description: `Getting Started with Amplify - how to model your data using Amplify`,
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
+  filterKey: `integration`,
 };
 
 import next0 from "/src/fragments/start/getting-started/next/api.mdx";
diff --git a/src/pages/start/getting-started/generate-model/q/integration/[integration].mdx b/src/pages/start/getting-started/generate-model/q/integration/[integration].mdx
index 6a84f6e622d..133132a8684 100644
--- a/src/pages/start/getting-started/generate-model/q/integration/[integration].mdx
+++ b/src/pages/start/getting-started/generate-model/q/integration/[integration].mdx
@@ -1,25 +1,7 @@
 export const meta = {
   title: `Generate model files`,
   description: `Getting Started with Amplify Libraries - Generate model files`,
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
+  filterKey: `integration`,
 };
 
 import ios0 from "/src/fragments/start/getting-started/ios/generate-model.mdx";
diff --git a/src/pages/start/getting-started/hosting/q/integration/[integration].mdx b/src/pages/start/getting-started/hosting/q/integration/[integration].mdx
index 6913c186d8e..49278f0f661 100644
--- a/src/pages/start/getting-started/hosting/q/integration/[integration].mdx
+++ b/src/pages/start/getting-started/hosting/q/integration/[integration].mdx
@@ -1,25 +1,7 @@
 export const meta = {
   title: `Deploy and host app`,
   description: `Getting Started with Amplify - how to host & deploy your web app`,
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
+  filterKey: `integration`
 };
 
 import next0 from '/src/fragments/start/getting-started/next/hosting.mdx';
diff --git a/src/pages/start/getting-started/installation/q/integration/[integration].mdx b/src/pages/start/getting-started/installation/q/integration/[integration].mdx
index 584d7802995..b313970adee 100644
--- a/src/pages/start/getting-started/installation/q/integration/[integration].mdx
+++ b/src/pages/start/getting-started/installation/q/integration/[integration].mdx
@@ -1,25 +1,7 @@
 export const meta = {
   title: `Prerequisites`,
   description: `Getting Started with Amplify - Prerequisites`,
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
+  filterKey: `integration`,
 };
 
 import js0 from "/src/fragments/start/getting-started/common/prereq.mdx";
diff --git a/src/pages/start/getting-started/integrate/q/integration/[integration].mdx b/src/pages/start/getting-started/integrate/q/integration/[integration].mdx
index 08641c01ab0..b26be6ec441 100644
--- a/src/pages/start/getting-started/integrate/q/integration/[integration].mdx
+++ b/src/pages/start/getting-started/integrate/q/integration/[integration].mdx
@@ -1,25 +1,7 @@
 export const meta = {
   title: `Integrate in your app`,
   description: `Getting Started with Amplify Libraries - How to integrate Amplify into your app`,
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
+  filterKey: `integration`,
 };
 
 import ios0 from "/src/fragments/start/getting-started/ios/integrate.mdx";
diff --git a/src/pages/start/getting-started/nextsteps/q/integration/[integration].mdx b/src/pages/start/getting-started/nextsteps/q/integration/[integration].mdx
index a2ad2d92128..917ce48359d 100644
--- a/src/pages/start/getting-started/nextsteps/q/integration/[integration].mdx
+++ b/src/pages/start/getting-started/nextsteps/q/integration/[integration].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Next steps`,
   description: `Getting Started with Amplify - Next steps`,
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import angular0 from "/src/fragments/start/getting-started/common/nextsteps-header.mdx";
diff --git a/src/pages/start/getting-started/setup/q/integration/[integration].mdx b/src/pages/start/getting-started/setup/q/integration/[integration].mdx
index 64162c93160..dd2a3355ae4 100644
--- a/src/pages/start/getting-started/setup/q/integration/[integration].mdx
+++ b/src/pages/start/getting-started/setup/q/integration/[integration].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `Set up fullstack project`,
   description: `Getting Started with Amplify - Setup a fullstack project`,
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import next0 from "/src/fragments/start/getting-started/next/setup.mdx";
diff --git a/src/pages/start/index.mdx b/src/pages/start/index.mdx
deleted file mode 100644
index 5c70dbc0273..00000000000
--- a/src/pages/start/index.mdx
+++ /dev/null
@@ -1,12 +0,0 @@
-import ChooseFilterPage from '@/components/ChooseFilterPage';
-
-import { INTEGRATION_FILTER_OPTIONS } from '@/utils/filter-data.ts';
-
-<ChooseFilterPage
-  directoryPath="/ChooseFilterPage"
-  address="/start"
-  filterKind="integration"
-  filters={INTEGRATION_FILTER_OPTIONS}
-  currentFilter="all"
-  message={`Please select one of the following:`}
-/>
diff --git a/src/pages/start/q/integration/[integration].mdx b/src/pages/start/q/integration/[integration].mdx
index d321ffdb1e8..0a159dc2bb1 100644
--- a/src/pages/start/q/integration/[integration].mdx
+++ b/src/pages/start/q/integration/[integration].mdx
@@ -2,25 +2,7 @@ export const meta = {
   title: 'Getting started',
   description: 'Getting Started with Amplify',
   disableTOC: 'true',
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
+  filterKey: 'integration'
 };
 
 AWS Amplify is a complete solution that lets frontend web and mobile developers easily build, connect, and host fullstack applications on AWS, with the flexibility to leverage the breadth of AWS services as your use cases evolve. Amplify provides the following products to build fullstack iOS, Android, Flutter, Web, and React Native apps. These products are all designed to work independently:
diff --git a/src/pages/start/sample-apps/todo-app/q/integration/[integration].mdx b/src/pages/start/sample-apps/todo-app/q/integration/[integration].mdx
index eec0c9ba982..a78eef232e6 100644
--- a/src/pages/start/sample-apps/todo-app/q/integration/[integration].mdx
+++ b/src/pages/start/sample-apps/todo-app/q/integration/[integration].mdx
@@ -1,25 +1,6 @@
 export const meta = {
   title: `ToDo App`,
   description: `Getting Started with Amplify - Try Amplify on a ToDo sample app`,
-  filterKey: "integration",
-  supportedPlatforms: INTEGRATION_FILTER_OPTIONS
-};
-      
-import { generateStaticPaths } from "@/utils/generateStaticPaths.tsx";
-
-import { INTEGRATION_FILTER_OPTIONS } from "@/utils/filter-data.ts";
-
-export const getStaticPaths = () => {
-    return generateStaticPaths(meta.filterKey, meta.supportedPlatforms);
-};
-
-export const getStaticProps = (context) => {
-    return {
-        props: {
-            integration: context.params.integration,
-            filterKind: meta.filterKey
-        }
-    };
 };
 
 import android1 from "/src/fragments/start/sample-apps/android/todo-app.mdx";
diff --git a/src/plugins/page.tsx b/src/plugins/page.tsx
index 25cc6fdca36..bbb4d6537a9 100644
--- a/src/plugins/page.tsx
+++ b/src/plugins/page.tsx
@@ -7,7 +7,8 @@ module.exports = (async () => {
         tree.children.splice(index + 1, 0, {
           type: 'export',
           default: true,
-          value: `export default ({ frontmatter, children, platform, filterKind, integration }) => <Page frontmatter={frontmatter} meta={meta} platform={platform||integration} filterKind={filterKind}>{children}</Page>`
+          value:
+            'export default ({ frontmatter, children }) => <Page frontmatter={frontmatter} meta={meta}>{children}</Page>'
         });
       }
     });
diff --git a/src/utils/filter-data.ts b/src/utils/filter-data.ts
index 291582a380b..083caa92bba 100644
--- a/src/utils/filter-data.ts
+++ b/src/utils/filter-data.ts
@@ -33,7 +33,7 @@ export const FRAMEWORK_FILTER_OPTIONS = [
   "flutter"
 ];
 
-export const INTEGRATION_FILTER_OPTIONS = [...new Set([
+const INTEGRATION_FILTER_OPTIONS = [...new Set([
   ...PLATFORM_FILTER_OPTIONS,
   ...FRAMEWORK_FILTER_OPTIONS,
 ])];
diff --git a/src/utils/gatherFilters.ts b/src/utils/gatherFilters.ts
index 80becbe8255..c67b0ff88f4 100644
--- a/src/utils/gatherFilters.ts
+++ b/src/utils/gatherFilters.ts
@@ -38,7 +38,6 @@ const treeHasAgnosticContent = function(tree): boolean {
 };
 
 const addFilters = function(filters, newFilters) {
-  if(!newFilters || typeof newFilters[Symbol.iterator] !== 'function') return;
   for (const filter of newFilters) {
     if (!filters.includes(filter)) filters.push(filter);
   }
diff --git a/src/utils/generateStaticPaths.tsx b/src/utils/generateStaticPaths.tsx
deleted file mode 100644
index 4b9827e65f0..00000000000
--- a/src/utils/generateStaticPaths.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-export function generateStaticPaths(
-  filterKey: string,
-  supportedPlatforms: string[]
-) {
-  return {
-    paths: supportedPlatforms.map((platform) => {
-      return {
-        params: {
-          [filterKey]: platform
-        }
-      };
-    }),
-    fallback: false
-  };
-}
diff --git a/tsconfig.json b/tsconfig.json
index 57972aaa937..073987f7d7d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,11 +11,7 @@
     "noEmit": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true,
-    "paths": {
-      "@/utils/*": ["src/utils/*"],
-      "@/components/*": ["src/components/*"]
-    }
+    "incremental": true
   },
   "extends": "./tsconfig.base.json",
   "include": [