diff --git a/src/components/VAllResultsGrid/VAllResultsGrid.vue b/src/components/VAllResultsGrid/VAllResultsGrid.vue
index 3decd57048..2a5b0473b4 100644
--- a/src/components/VAllResultsGrid/VAllResultsGrid.vue
+++ b/src/components/VAllResultsGrid/VAllResultsGrid.vue
@@ -5,13 +5,12 @@
       class="results-grid mb-4 grid grid-cols-2 gap-4 lg:grid-cols-5 2xl:grid-cols-6"
     >
       <VContentLink
-        v-for="([mediaType, count], i) in resultCounts"
+        v-for="[mediaType, count] in resultCounts"
         :key="mediaType"
         :media-type="mediaType"
         :results-count="count"
         :to="contentLinkPath(mediaType)"
         class="lg:col-span-2"
-        @shift-tab="handleShiftTab($event, i)"
       />
     </div>
     <VSnackbar size="large" :is-visible="isSnackbarVisible">
@@ -58,11 +57,8 @@ import { useMediaStore } from "~/stores/media"
 import { useSearchStore } from "~/stores/search"
 import { useUiStore } from "~/stores/ui"
 
-import { useFocusFilters } from "~/composables/use-focus-filters"
 import { useI18n } from "~/composables/use-i18n"
 
-import { Focus } from "~/utils/focus-management"
-
 import VSnackbar from "~/components/VSnackbar.vue"
 import VImageCellSquare from "~/components/VAllResultsGrid/VImageCellSquare.vue"
 import VAudioCell from "~/components/VAllResultsGrid/VAudioCell.vue"
@@ -112,17 +108,6 @@ export default defineComponent({
     const noResults = computed(
       () => fetchState.value.isFinished && allMedia.value.length === 0
     )
-    const focusFilters = useFocusFilters()
-    /**
-     * Move focus to the filters sidebar if shift-tab is pressed on the first content link.
-     * @param i - the index of the content link.
-     * @param event - keydown event
-     */
-    const handleShiftTab = (event: KeyboardEvent, i: number) => {
-      if (i === 0) {
-        focusFilters.focusFilterSidebar(event, Focus.Last)
-      }
-    }
 
     const uiStore = useUiStore()
     const isSnackbarVisible = computed(() => uiStore.areInstructionsVisible)
@@ -142,7 +127,6 @@ export default defineComponent({
       resultsLoading,
       resultCounts,
       noResults,
-      handleShiftTab,
 
       contentLinkPath,
 
diff --git a/src/components/VExternalSearch/VExternalSearchForm.vue b/src/components/VExternalSearch/VExternalSearchForm.vue
index 2e837bac22..cac6e2fb99 100644
--- a/src/components/VExternalSearch/VExternalSearchForm.vue
+++ b/src/components/VExternalSearch/VExternalSearchForm.vue
@@ -4,7 +4,6 @@
     ref="sectionRef"
     class="external-sources flex flex-row place-items-center justify-center py-4"
     data-testid="external-sources-form"
-    @keydown.tab.exact="handleTab"
   >
     <i18n
       v-if="!hasNoResults && isSupported"
@@ -95,7 +94,6 @@ import {
   SetupContext,
 } from "@nuxtjs/composition-api"
 
-import { getFocusableElements } from "~/utils/focus-management"
 import { defineEvent } from "~/types/emits"
 
 import { useUiStore } from "~/stores/ui"
@@ -172,26 +170,10 @@ export default defineComponent({
       emit: emit as SetupContext["emit"],
     })
 
-    /**
-     * Find the last focusable element in VSearchGridFilter to add a 'Tab' keydown event
-     * handler to it.
-     * We could actually hard-code this because 'searchBy' is always the last now.
-     */
-    const lastFocusableElement = computed<HTMLElement>(() => {
-      const focusable = getFocusableElements(sectionRef.value)
-      return focusable[focusable.length - 1]
-    })
-
-    const handleTab = (event: KeyboardEvent) => {
-      if (event.target === lastFocusableElement.value) {
-        emit("tab", event)
-      }
-    }
     return {
       sectionRef,
       triggerRef,
       triggerElement,
-      handleTab,
       isMd,
 
       closeDialog,
diff --git a/src/components/VFilters/VSearchGridFilter.vue b/src/components/VFilters/VSearchGridFilter.vue
index 0e88c50523..bc25b62c2a 100644
--- a/src/components/VFilters/VSearchGridFilter.vue
+++ b/src/components/VFilters/VSearchGridFilter.vue
@@ -13,17 +13,11 @@
         variant="plain"
         class="label-bold absolute py-1 px-4 text-pink end-0 hover:ring hover:ring-pink"
         @click="clearFilters"
-        @keydown.shift.tab.exact="focusFilterButton"
       >
         {{ $t("filter-list.clear") }}
       </VButton>
     </header>
-    <form
-      ref="filtersFormRef"
-      class="filters-form"
-      @keydown.tab.exact="handleTabKey"
-      @keydown.shift.tab.exact="handleShiftTabKey"
-    >
+    <form ref="filtersFormRef" class="filters-form">
       <VFilterChecklist
         v-for="filterType in filterTypes"
         :key="filterType"
@@ -58,9 +52,7 @@ import { watchDebounced } from "@vueuse/core"
 
 import { useSearchStore } from "~/stores/search"
 import { areQueriesEqual, ApiQueryParams } from "~/utils/search-query-transform"
-import { Focus, focusIn, getFocusableElements } from "~/utils/focus-management"
 import type { NonMatureFilterCategory } from "~/constants/filters"
-import { useFocusFilters } from "~/composables/use-focus-filters"
 import { defineEvent } from "~/types/emits"
 
 import VFilterChecklist from "~/components/VFilters/VFilterChecklist.vue"
@@ -94,7 +86,7 @@ export default defineComponent({
   emits: {
     close: defineEvent(),
   },
-  setup(props) {
+  setup() {
     const searchStore = useSearchStore()
 
     const { i18n } = useContext()
@@ -126,60 +118,7 @@ export default defineComponent({
       { debounce: 800, maxWait: 5000 }
     )
 
-    const focusableElements = computed(() =>
-      getFocusableElements(filtersFormRef.value)
-    )
-    /**
-     * Find the last focusable element in VSearchGridFilter to add a 'Tab' keydown event
-     * handler to it.
-     * We could actually hard-code this because 'searchBy' is always the last now.
-     */
-    const lastFocusableElement = computed<HTMLElement>(() => {
-      return focusableElements.value[focusableElements.value.length - 1]
-    })
-
-    /**
-     * We add the `Shift-Tab` handler to the first focusable checkbox so that focus can go back
-     * to the filter button
-     */
-    const firstFocusableElement = computed<HTMLElement | undefined>(
-      () => focusableElements.value[0]
-    )
-
-    /**
-     * When the user presses 'Tab' on the last focusable element, we need to
-     * move focus to the first focusable element in main.
-     * @param event
-     */
-    const handleTabKey = (event: KeyboardEvent) => {
-      if (!props.changeTabOrder) return
-      if (lastFocusableElement.value === event.target) {
-        event.preventDefault()
-        focusIn(document.querySelector("main"), Focus.First)
-      }
-    }
-    /**
-     * Move focus to the filter button only when this checkbox is the first focusable
-     * element in the search grid filter, i.e. the 'Clear filters' button is hidden.
-     * @param event - The keydown event
-     */
-    const handleShiftTabKey = (event: KeyboardEvent) => {
-      if (!props.changeTabOrder) return
-      if (
-        firstFocusableElement.value === event.target &&
-        !isAnyFilterApplied.value
-      ) {
-        focusFilterButton(event)
-      }
-    }
-
-    const focusFilters = useFocusFilters()
-    const focusFilterButton = (event?: KeyboardEvent) => {
-      focusFilters.focusFilterButton(event)
-    }
-
     return {
-      firstFocusableElement,
       filtersFormRef,
       isAnyFilterApplied,
       filters,
@@ -187,9 +126,6 @@ export default defineComponent({
       filterTypeTitle,
       clearFilters: searchStore.clearFilters,
       toggleFilter: searchStore.toggleFilter,
-      handleTabKey,
-      handleShiftTabKey,
-      focusFilterButton,
     }
   },
 })
diff --git a/src/components/VHeader/VHeaderDesktop.vue b/src/components/VHeader/VHeaderDesktop.vue
index 549ee8528e..c6ad2291e7 100644
--- a/src/components/VHeader/VHeaderDesktop.vue
+++ b/src/components/VHeader/VHeaderDesktop.vue
@@ -42,7 +42,6 @@
       aria-haspopup="dialog"
       :aria-expanded="isSidebarVisible"
       @toggle="toggleSidebar"
-      @tab="onTab"
     />
   </header>
 </template>
@@ -55,10 +54,8 @@ import { useUiStore } from "~/stores/ui"
 
 import { IsHeaderScrolledKey, IsSidebarVisibleKey } from "~/types/provides"
 
-import { useFocusFilters } from "~/composables/use-focus-filters"
 import { useSearch } from "~/composables/use-search"
 
-import { Focus } from "~/utils/focus-management"
 import { ensureFocus } from "~/utils/reakit-utils/focus"
 
 import VFilterButton from "~/components/VHeader/VFilterButton.vue"
@@ -113,15 +110,6 @@ export default defineComponent({
 
     const toggleSidebar = () => uiStore.toggleFilters()
 
-    const focusFilters = useFocusFilters()
-    /**
-     * Focus the first element in the sidebar when navigating from the VFilterButton
-     * using keyboard `Tab` key.
-     */
-    const onTab = (event: KeyboardEvent) => {
-      focusFilters.focusFilterSidebar(event, Focus.First)
-    }
-
     const isXl = computed(() => uiStore.isBreakpoint("xl"))
 
     return {
@@ -140,7 +128,6 @@ export default defineComponent({
       searchStatus,
       searchTerm,
       toggleSidebar,
-      onTab,
     }
   },
 })
diff --git a/src/components/VHeaderOld/VHeaderFilter.vue b/src/components/VHeaderOld/VHeaderFilter.vue
deleted file mode 100644
index 3e333c728f..0000000000
--- a/src/components/VHeaderOld/VHeaderFilter.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-  <div
-    ref="nodeRef"
-    class="flex items-stretch justify-end text-sr md:text-base"
-  >
-    <VFilterButtonOld
-      ref="buttonRef"
-      class="self-stretch"
-      :class="isFilterVisible ? 'hidden md:flex' : 'flex'"
-      :pressed="isFilterVisible"
-      :disabled="disabled"
-      aria-haspopup="dialog"
-      :aria-expanded="isFilterVisible"
-      @toggle="onTriggerClick"
-      @tab="onTab"
-    />
-    <VModalContent
-      v-if="isFilterVisible && !isDesktopLayout"
-      :hide="onTriggerClick"
-      :visible="true"
-      :trigger-element="triggerElement"
-      :aria-label="$t('header.filter-button.simple')"
-    >
-      <VSearchGridFilter class="px-6 pt-[7px] pb-10" @close="onTriggerClick" />
-    </VModalContent>
-  </div>
-</template>
-
-<script lang="ts">
-import {
-  defineComponent,
-  ref,
-  watch,
-  computed,
-  onBeforeUnmount,
-} from "@nuxtjs/composition-api"
-
-import { useBodyScrollLock } from "~/composables/use-body-scroll-lock"
-import { useFocusFilters } from "~/composables/use-focus-filters"
-
-import { Focus } from "~/utils/focus-management"
-import { defineEvent } from "~/types/emits"
-
-import { useUiStore } from "~/stores/ui"
-
-import VModalContent from "~/components/VModal/VModalContent.vue"
-import VSearchGridFilter from "~/components/VFilters/VSearchGridFilter.vue"
-import VFilterButtonOld from "~/components/VHeaderOld/VFilterButtonOld.vue"
-
-export default defineComponent({
-  name: "VHeaderFilter",
-  components: {
-    VFilterButtonOld,
-    VModalContent,
-    VSearchGridFilter,
-  },
-  props: {
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  emits: {
-    /**
-     * Fires when the popover opens, regardless of reason. There are no extra parameters.
-     */
-    open: defineEvent(),
-    /**
-     * Fires when the popover closes, regardless of reason. There are no extra parameters.
-     */
-    close: defineEvent(),
-  },
-  setup(props, { emit }) {
-    const nodeRef = ref<HTMLElement | null>(null)
-
-    const uiStore = useUiStore()
-
-    const isDesktopLayout = computed(() => uiStore.isDesktopLayout)
-
-    const isFilterVisible = computed(
-      () => !props.disabled && uiStore.isFilterVisible
-    )
-    watch(isFilterVisible, (visible) => {
-      emit(visible ? "open" : "close")
-    })
-    const { lock, unlock } = useBodyScrollLock({ nodeRef })
-
-    onBeforeUnmount(() => unlock())
-
-    // Lock the scroll when the screen changes to below Md if filters are open.
-    watch(isDesktopLayout, (isDesktop) => {
-      if (!isDesktop && uiStore.isFilterVisible) {
-        lock()
-      }
-    })
-
-    const onTriggerClick = () => uiStore.toggleFilters()
-
-    const focusFilters = useFocusFilters()
-    /**
-     * Focus the first element in the sidebar when navigating from the VFilterButton
-     * using keyboard `Tab` key.
-     */
-    const onTab = (event: KeyboardEvent) => {
-      focusFilters.focusFilterSidebar(event, Focus.First)
-    }
-
-    const triggerElement = computed(() =>
-      nodeRef.value?.firstChild
-        ? (nodeRef.value?.firstChild as HTMLElement)
-        : null
-    )
-
-    return {
-      nodeRef,
-      isFilterVisible,
-      triggerElement,
-      isDesktopLayout,
-
-      onTriggerClick,
-      onTab,
-    }
-  },
-})
-</script>
diff --git a/src/components/VHeaderOld/VHeaderOld.vue b/src/components/VHeaderOld/VHeaderOld.vue
deleted file mode 100644
index d59fbe0d59..0000000000
--- a/src/components/VHeaderOld/VHeaderOld.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-<template>
-  <header
-    class="main-header z-30 flex w-full items-center justify-between gap-x-2 gap-y-4 bg-white px-4 py-3 md:items-stretch md:py-4 md:px-7"
-    :class="{
-      'flex-wrap md:flex-nowrap': !isHeaderScrolled,
-      'border-b border-white': !isHeaderScrolled && !isMenuOpen,
-      'border-b border-dark-charcoal-20':
-        isSearchRoute && (isHeaderScrolled || isMenuOpen),
-      'md:justify-start': !isSearchRoute,
-      'flex-nowrap': !isSearchRoute && isHeaderScrolled,
-    }"
-  >
-    <VLogoButtonOld
-      :is-fetching="isFetching"
-      :is-header-scrolled="isHeaderScrolled"
-      :is-search-route="isSearchRoute"
-      class="md:h-12"
-    />
-
-    <VSearchBarOld
-      v-model.trim="searchTerm"
-      class="flex-grow md:!h-12 lg:w-1/2 lg:flex-grow-0 2xl:w-1/3"
-      :size="searchBarSize"
-      :class="{
-        'order-4 w-full md:order-none md:w-auto': !isHeaderScrolled,
-      }"
-      @submit="handleSearch"
-    >
-      <span
-        v-show="searchStatus"
-        class="info mx-4 hidden whitespace-nowrap text-xs font-semibold text-dark-charcoal-70 group-hover:text-dark-charcoal group-focus:text-dark-charcoal lg:block"
-      >
-        {{ searchStatus }}
-      </span>
-    </VSearchBarOld>
-
-    <VHeaderMenu
-      :is-search-route="isSearchRoute"
-      @open="openMenuModal(menus.CONTENT_SWITCHER)"
-      @close="close"
-    />
-    <VHeaderFilter
-      v-if="isSearchRoute"
-      :disabled="areFiltersDisabled"
-      @open="openMenuModal(menus.FILTERS)"
-      @close="close"
-    />
-  </header>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, inject, ref } from "@nuxtjs/composition-api"
-
-import { useMatchSearchRoutes } from "~/composables/use-match-routes"
-import { useSearch } from "~/composables/use-search"
-
-import { useMediaStore } from "~/stores/media"
-import { useSearchStore } from "~/stores/search"
-import { useUiStore } from "~/stores/ui"
-
-import { IsSidebarVisibleKey } from "~/types/provides"
-
-import VLogoButtonOld from "~/components/VHeaderOld/VLogoButtonOld.vue"
-import VHeaderFilter from "~/components/VHeaderOld/VHeaderFilter.vue"
-import VSearchBarOld from "~/components/VHeaderOld/VSearchBar/VSearchBarOld.vue"
-import VHeaderMenu from "~/components/VHeaderOld/VHeaderMenu.vue"
-
-import closeIcon from "~/assets/icons/close.svg"
-
-const menus = {
-  FILTERS: "filters",
-  CONTENT_SWITCHER: "content-switcher",
-}
-type HeaderMenu = "filters" | "content-switcher"
-
-export default defineComponent({
-  name: "VHeaderOld",
-  components: {
-    VLogoButtonOld,
-    VHeaderFilter,
-    VHeaderMenu,
-    VSearchBarOld,
-  },
-  setup() {
-    const mediaStore = useMediaStore()
-    const searchStore = useSearchStore()
-    const uiStore = useUiStore()
-
-    const { matches: isSearchRoute } = useMatchSearchRoutes()
-
-    const isHeaderScrolled = inject("isHeaderScrolled", ref(false))
-    const headerHasTwoRows = inject("headerHasTwoRows")
-    const isSidebarVisible = inject(IsSidebarVisibleKey)
-
-    const isDesktopLayout = computed(() => uiStore.isDesktopLayout)
-
-    const searchBarSize = computed(() => {
-      if (isDesktopLayout.value) {
-        return "medium"
-      } else if (isHeaderScrolled.value) {
-        return "small"
-      } else {
-        return "large"
-      }
-    })
-
-    const openMenu = ref<null | HeaderMenu>(null)
-    const isMenuOpen = computed(
-      () => openMenu.value !== null || isSidebarVisible.value
-    )
-
-    const openMenuModal = (menuName: HeaderMenu) => {
-      if (openMenu.value !== null) {
-        close()
-      }
-      openMenu.value = menuName
-    }
-    const close = () => {
-      openMenu.value = null
-    }
-
-    const isFetching = computed(() => mediaStore.fetchState.isFetching)
-
-    const { updateSearchState, searchTerm, searchStatus } = useSearch()
-
-    const handleSearch = () => {
-      window.scrollTo({ top: 0, left: 0, behavior: "auto" })
-
-      document.activeElement?.blur()
-      updateSearchState()
-    }
-    const areFiltersDisabled = computed(
-      () => !searchStore.searchTypeIsSupported
-    )
-
-    return {
-      closeIcon,
-      isFetching,
-
-      isHeaderScrolled,
-      isDesktopLayout,
-      isSearchRoute,
-      headerHasTwoRows,
-      areFiltersDisabled,
-      searchBarSize,
-
-      openMenu,
-      openMenuModal,
-      isMenuOpen,
-
-      menus,
-      close,
-
-      handleSearch,
-      searchStatus,
-      searchTerm,
-    }
-  },
-})
-</script>
diff --git a/src/components/VHeaderOld/meta/VFilterButtonOld.stories.mdx b/src/components/VHeaderOld/meta/VFilterButtonOld.stories.mdx
deleted file mode 100644
index 225ee567f2..0000000000
--- a/src/components/VHeaderOld/meta/VFilterButtonOld.stories.mdx
+++ /dev/null
@@ -1,99 +0,0 @@
-import {
-  ArgsTable,
-  Canvas,
-  Description,
-  Meta,
-  Story,
-} from "@storybook/addon-docs"
-import { provide, ref } from "@nuxtjs/composition-api"
-
-import { useSearchStore } from "~/stores/search"
-import { useUiStore } from "~/stores/ui"
-
-import { filterData, mediaFilterKeys } from "~/constants/filters"
-import { IMAGE } from "~/constants/media"
-
-import VFilterButtonOld from "~/components/VHeaderOld/VFilterButtonOld.vue"
-
-<Meta
-  title="Components/VHeaderOld/VFilterButtonOld"
-  component={VFilterButtonOld}
-  argTypes={{
-    pressed: {
-      type: "boolean",
-    },
-    appliedFilters: {
-      type: "number",
-    },
-    scrolled: {
-      type: "boolean",
-    },
-    isMinMd: {
-      type: "boolean",
-    },
-  }}
-/>
-
-export const Template = (args, { argTypes }) => ({
-  template: `<VFilterButtonOld v-bind="args" />`,
-  components: { VFilterButtonOld },
-  props: Object.keys(argTypes),
-  setup() {
-    const searchStore = useSearchStore()
-    searchStore.setSearchType(IMAGE)
-    function applyNFilters(filterCount) {
-      const filterTypes = [...mediaFilterKeys[IMAGE]]
-      let filterIdx = 0
-      // Skip license type filters as they can disable license filters
-      let filterTypeIdx = 1
-      for (let i = 0; i < filterCount; i++) {
-        let filterType = filterTypes[filterTypeIdx]
-        searchStore.toggleFilter({
-          filterType,
-          codeIdx: filterIdx,
-        })
-        filterIdx += 1
-        if (filterData[filterType].length === filterIdx) {
-          filterTypeIdx += 1
-          filterIdx = 0
-        }
-      }
-    }
-    applyNFilters(args.appliedFilters)
-    if (args.scrolled) {
-      provide("isHeaderScrolled", ref(true))
-    }
-    if (args.isMinMd) {
-      const uiStore = useUiStore()
-      uiStore.isDesktopLayout = true
-    }
-    return { args }
-  },
-})
-
-# Filter button
-
-<Description of={VFilterButtonOld} />
-
-<ArgsTable of={VFilterButtonOld} />
-
-The button opens and closes the filters sidebar. It also shows how many filters
-are applied in the mobile view. the field receives an input. It also emits the
-`search` event when the search button is clicked.
-
-<Canvas>
-  <Story name="Default">{Template.bind({})}</Story>
-</Canvas>
-
-<Canvas>
-  <Story
-    name="Mobile Scrolled"
-    parameters={{
-      viewport: {
-        defaultViewport: "sm",
-      },
-    }}
-  >
-    {Template.bind({})}
-  </Story>
-</Canvas>
diff --git a/src/components/VHeaderOld/meta/VHeader.stories.mdx b/src/components/VHeaderOld/meta/VHeader.stories.mdx
deleted file mode 100644
index c1cbf2ff8b..0000000000
--- a/src/components/VHeaderOld/meta/VHeader.stories.mdx
+++ /dev/null
@@ -1,43 +0,0 @@
-import {
-  ArgsTable,
-  Canvas,
-  Description,
-  Meta,
-  Story,
-} from "@storybook/addon-docs"
-import VHeaderOld from "~/components/VHeaderOld/VHeaderOld.vue"
-
-<Meta
-  title="Components/VHeader/VHeader"
-  component={VHeaderOld}
-  argTypes={{
-    input: {
-      action: "input",
-    },
-    submit: {
-      action: "submit",
-    },
-  }}
-/>
-
-export const Template = (args) => ({
-  template: `
-    <VHeaderOld v-bind="args" v-on="args" />`,
-  components: { VHeaderOld },
-  setup() {
-    return { args }
-  },
-})
-
-# VHeader
-
-<Description of={VHeaderOld} />
-
-<ArgsTable of={VHeaderOld} />
-
-The header component. Fixed on scroll, search bar, content switcher, pages menu
-and filters button.
-
-<Canvas>
-  <Story name="Default">{Template.bind({})}</Story>
-</Canvas>
diff --git a/src/components/VImageGrid/VImageGrid.vue b/src/components/VImageGrid/VImageGrid.vue
index e83386006e..f213a40e8a 100644
--- a/src/components/VImageGrid/VImageGrid.vue
+++ b/src/components/VImageGrid/VImageGrid.vue
@@ -2,11 +2,10 @@
   <section>
     <div class="image-grid flex flex-wrap gap-4">
       <VImageCell
-        v-for="(image, index) in images"
+        v-for="image in images"
         :key="image.id"
         :image="image"
         :search-term="searchTerm"
-        @shift-tab="handleShiftTab($event, index)"
       />
     </div>
     <h5 v-if="isError && !fetchState.isFinished" class="py-4">
@@ -33,8 +32,6 @@ import { useSearchStore } from "~/stores/search"
 import type { FetchState } from "~/types/fetch-state"
 import type { ImageDetail } from "~/types/media"
 
-import { defineEvent } from "~/types/emits"
-
 import VLoadMore from "~/components/VLoadMore.vue"
 import VImageCell from "~/components/VImageGrid/VImageCell.vue"
 
@@ -61,23 +58,13 @@ export default defineComponent({
       required: true,
     },
   },
-  emits: {
-    "shift-tab": defineEvent(),
-  },
-  setup(props, { emit }) {
+  setup(props) {
     const searchStore = useSearchStore()
 
     const searchTerm = computed(() => searchStore.searchTerm)
     const isError = computed(() => Boolean(props.fetchState.fetchingError))
 
-    const handleShiftTab = (event: KeyboardEvent, index: number) => {
-      if (index === 0) {
-        event.preventDefault()
-        emit("shift-tab")
-      }
-    }
-
-    return { isError, handleShiftTab, searchTerm }
+    return { isError, searchTerm }
   },
 })
 </script>
diff --git a/src/composables/use-focus-filters.ts b/src/composables/use-focus-filters.ts
deleted file mode 100644
index 49fbb0a0ca..0000000000
--- a/src/composables/use-focus-filters.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Focus, focusIn } from "~/utils/focus-management"
-import { useUiStore } from "~/stores/ui"
-
-export const useFocusFilters = () => {
-  const focusFilterSidebar = (event?: KeyboardEvent, focus = Focus.Last) => {
-    const uiStore = useUiStore()
-    if (uiStore.isDesktopLayout && uiStore.isFilterVisible) {
-      if (event) event.preventDefault()
-      // Prevent over-tabbing to the element after the target one
-      // Cannot use refs when using portals (for sidebar)
-      const filtersSidebarElement = document.getElementById("filters")
-      if (filtersSidebarElement) {
-        focusIn(filtersSidebarElement, focus)
-      }
-    }
-  }
-  const focusFilterButton = (event?: KeyboardEvent) => {
-    const uiStore = useUiStore()
-    if (uiStore.isDesktopLayout && uiStore.isFilterVisible) {
-      if (event) event.preventDefault()
-      const filterButton = document.getElementById("filter-button")
-      if (filterButton) {
-        filterButton.focus()
-      }
-    }
-  }
-
-  return { focusFilterSidebar, focusFilterButton }
-}
diff --git a/src/layouts/content-layout.vue b/src/layouts/content-layout.vue
index acd1ee8fd2..47a4104926 100644
--- a/src/layouts/content-layout.vue
+++ b/src/layouts/content-layout.vue
@@ -1,55 +1,43 @@
 <template>
   <div
-    class="app flex min-h-screen min-h-[100dvh] flex-col bg-white"
-    :class="[isDesktopLayout ? 'desktop' : 'mobile', breakpoint]"
+    class="app flex grid min-h-screen min-h-[100dvh] grid-rows-[auto,1fr] bg-white"
+    :class="[
+      isDesktopLayout ? 'desktop' : 'mobile',
+      breakpoint,
+      { 'has-sidebar': isSidebarVisible },
+      isSidebarVisible
+        ? 'grid-cols-[1fr_var(--filter-sidebar-width)]'
+        : 'grid-cols-1',
+    ]"
   >
-    <div class="sticky top-0 z-40 block">
+    <div class="header-el sticky top-0 z-40 block">
       <VTeleportTarget name="skip-to-content" :force-destroy="true" />
       <VBanners />
-      <template v-if="isNewHeaderEnabled">
-        <template v-if="isSearchHeader">
-          <VHeaderDesktop v-if="isDesktopLayout" class="bg-white" />
-          <VHeaderMobile v-else class="bg-white" />
-        </template>
-        <VHeaderInternal
-          v-else
-          :class="[
-            'bg-white',
-            { 'border-b-dark-charcoal-20': isHeaderScrolled },
-          ]"
-        />
+      <template v-if="isSearchHeader">
+        <VHeaderDesktop v-if="isDesktopLayout" class="bg-white" />
+        <VHeaderMobile v-else class="bg-white" />
       </template>
-      <VHeaderOld v-else class="bg-white" />
+      <VHeaderInternal
+        v-else
+        class="bg-white"
+        :class="{ 'border-b-dark-charcoal-20': isHeaderScrolled }"
+      />
     </div>
 
-    <main
-      class="main grid h-full flex-grow"
-      :class="[
-        { 'has-sidebar': isSidebarVisible },
-        isSidebarVisible
-          ? 'grid-cols-[1fr_var(--filter-sidebar-width)]'
-          : 'grid-cols-1',
-      ]"
+    <aside
+      v-if="isSidebarVisible"
+      class="sidebar fixed z-10 mt-[81px] h-[calc(100vh-81px)] h-[calc(100dvh-81px)] overflow-y-auto border-dark-charcoal-20 bg-dark-charcoal-06 end-0 border-s"
     >
-      <div
-        v-if="isNewHeaderEnabled"
-        class="main-page flex h-full w-full min-w-0 flex-col justify-between"
-      >
-        <Nuxt />
-        <VFooter
-          :mode="isSearchHeader ? 'content' : 'search'"
-          class="border-t border-dark-charcoal-20 bg-white"
-        />
-      </div>
-      <Nuxt v-else class="main-page flex h-full w-full min-w-0 flex-col" />
-
-      <aside
-        v-if="isSidebarVisible"
-        class="sidebar fixed z-10 h-[calc(100vh-81px)] h-[calc(100dvh-81px)] overflow-y-auto border-dark-charcoal-20 bg-dark-charcoal-06 end-0 border-s"
-      >
-        <VSearchGridFilter class="px-10 pt-8 pb-10" @close="closeSidebar" />
-      </aside>
-    </main>
+      <VSearchGridFilter class="px-10 pt-8 pb-10" @close="closeSidebar" />
+    </aside>
+
+    <div class="main-page flex h-full w-full min-w-0 flex-col justify-between">
+      <Nuxt />
+      <VFooter
+        mode="content"
+        class="border-t border-dark-charcoal-20 bg-white"
+      />
+    </div>
 
     <VModalTarget class="modal" />
     <VGlobalAudioSection />
@@ -71,18 +59,16 @@ import { useWindowScroll } from "~/composables/use-window-scroll"
 import {
   useMatchSearchRoutes,
   useMatchSingleResultRoutes,
-  useMatchContentPageRoutes,
 } from "~/composables/use-match-routes"
 import { useLayout } from "~/composables/use-layout"
 
-import { useFeatureFlagStore } from "~/stores/feature-flag"
 import { useUiStore } from "~/stores/ui"
 import { useSearchStore } from "~/stores/search"
 
 import { IsHeaderScrolledKey, IsSidebarVisibleKey } from "~/types/provides"
 
 import VBanners from "~/components/VBanner/VBanners.vue"
-import VHeaderOld from "~/components/VHeaderOld/VHeaderOld.vue"
+import VFooter from "~/components/VFooter/VFooter.vue"
 import VModalTarget from "~/components/VModal/VModalTarget.vue"
 import VGlobalAudioSection from "~/components/VGlobalAudioSection/VGlobalAudioSection.vue"
 import VSearchGridFilter from "~/components/VFilters/VSearchGridFilter.vue"
@@ -100,8 +86,7 @@ export default defineComponent({
     VHeaderInternal: () => import("~/components/VHeader/VHeaderInternal.vue"),
     VHeaderMobile: () =>
       import("~/components/VHeader/VHeaderMobile/VHeaderMobile.vue"),
-    VFooter: () => import("~/components/VFooter/VFooter.vue"),
-    VHeaderOld,
+    VFooter,
     VModalTarget,
     VTeleportTarget,
     VGlobalAudioSection,
@@ -110,12 +95,8 @@ export default defineComponent({
   setup() {
     const { app } = useContext()
     const uiStore = useUiStore()
-    const featureFlagStore = useFeatureFlagStore()
     const searchStore = useSearchStore()
 
-    const isNewHeaderEnabled = computed(() =>
-      featureFlagStore.isOn("new_header")
-    )
     const { updateBreakpoint } = useLayout()
 
     /**
@@ -129,18 +110,9 @@ export default defineComponent({
 
     const { matches: isSearchRoute } = useMatchSearchRoutes()
     const { matches: isSingleResultRoute } = useMatchSingleResultRoutes()
-    const { matches: isContentPageRoute } = useMatchContentPageRoutes()
 
     const nuxtError = computed(() => app.nuxt.err)
 
-    const isWhite = computed(
-      () =>
-        !nuxtError.value &&
-        (isSearchRoute.value ||
-          isSingleResultRoute.value ||
-          isContentPageRoute.value)
-    )
-
     const isSearchHeader = computed(
       () =>
         !nuxtError.value && (isSearchRoute.value || isSingleResultRoute.value)
@@ -177,22 +149,12 @@ export default defineComponent({
     provide(IsHeaderScrolledKey, isHeaderScrolled)
     provide(IsSidebarVisibleKey, isSidebarVisible)
 
-    // TODO: remove `headerHasTwoRows` provide after the new header is enabled.
-    const headerHasTwoRows = computed(
-      () =>
-        isSearchRoute.value && !isHeaderScrolled.value && !isDesktopLayout.value
-    )
-    provide("headerHasTwoRows", headerHasTwoRows)
-
     return {
       isHeaderScrolled,
       isDesktopLayout,
       isSidebarVisible,
       isSearchRoute,
       isSearchHeader,
-      headerHasTwoRows,
-      isNewHeaderEnabled,
-      isWhite,
       breakpoint,
 
       closeSidebar,
@@ -211,4 +173,19 @@ export default defineComponent({
 .has-sidebar .sidebar {
   width: var(--filter-sidebar-width);
 }
+.app {
+  grid-template-areas: "header header" "main main";
+}
+.header-el {
+  grid-area: header;
+}
+.main-page {
+  grid-area: main;
+}
+.sidebar {
+  grid-area: sidebar;
+}
+.has-sidebar.app {
+  grid-template-areas: "header header" "main sidebar";
+}
 </style>
diff --git a/src/pages/search.vue b/src/pages/search.vue
index ab29472700..18a01b1f05 100644
--- a/src/pages/search.vue
+++ b/src/pages/search.vue
@@ -11,7 +11,6 @@
       :search-type="searchType"
       :results-count="resultCount"
       data-testid="search-grid"
-      @tab="handleTab($event, 'search-grid')"
     >
       <template #media>
         <NuxtChild
@@ -28,7 +27,6 @@
       v-show="showScrollButton"
       :is-filter-sidebar-visible="isSidebarVisible"
       data-testid="scroll-button"
-      @tab="handleTab($event, 'scroll-button')"
     />
   </VSkipToContentContainer>
 </template>
@@ -37,7 +35,6 @@
 import { isShallowEqualObjects } from "@wordpress/is-shallow-equal"
 import { computed, defineComponent, inject, ref } from "@nuxtjs/composition-api"
 
-import { Focus, focusIn } from "~/utils/focus-management"
 import { useMediaStore } from "~/stores/media"
 import { useSearchStore } from "~/stores/search"
 import { useFeatureFlagStore } from "~/stores/feature-flag"
@@ -169,12 +166,6 @@ export default defineComponent({
     },
   },
   methods: {
-    handleTab(event: KeyboardEvent, element: string) {
-      if (this.showScrollButton.value && element !== "scroll-button") {
-        return
-      }
-      focusIn(document.getElementById("__layout"), Focus.First)
-    },
     fetchMedia(payload: { shouldPersistMedia?: boolean } = {}) {
       const mediaStore = useMediaStore(this.$pinia)
       return mediaStore.fetchMedia(payload)
diff --git a/src/pages/search/audio.vue b/src/pages/search/audio.vue
index 73ec20aebf..87542ddc4a 100644
--- a/src/pages/search/audio.vue
+++ b/src/pages/search/audio.vue
@@ -18,14 +18,13 @@
       is-for-tab="audio"
     />
     <VAudioTrack
-      v-for="(audio, i) in results"
+      v-for="audio in results"
       :key="audio.id"
       class="mb-2 md:mb-1"
       :audio="audio"
       :size="audioTrackSize"
       layout="row"
       :search-term="searchTerm"
-      @shift-tab="handleShiftTab($event, i)"
       @interacted="hideSnackbar"
       @mousedown.native="handleMouseDown"
       @focus.native="showSnackbar"
@@ -43,11 +42,8 @@ import {
   inject,
 } from "@nuxtjs/composition-api"
 
-import { useFocusFilters } from "~/composables/use-focus-filters"
 import { useSearchStore } from "~/stores/search"
 
-import { Focus } from "~/utils/focus-management"
-
 import { useUiStore } from "~/stores/ui"
 
 import { IsSidebarVisibleKey } from "~/types/provides"
@@ -86,13 +82,6 @@ export default defineComponent({
       !isDesktopLayout.value ? "s" : filterVisibleRef.value ? "l" : "m"
     )
 
-    const focusFilters = useFocusFilters()
-    const handleShiftTab = (event: KeyboardEvent, i: number) => {
-      if (i === 0) {
-        focusFilters.focusFilterSidebar(event, Focus.Last)
-      }
-    }
-
     const isMouseDown = ref(false)
     const handleMouseDown = () => {
       isMouseDown.value = true
@@ -117,7 +106,6 @@ export default defineComponent({
       results,
       audioTrackSize,
 
-      handleShiftTab,
       handleMouseDown,
 
       isSnackbarVisible,
diff --git a/src/pages/search/image.vue b/src/pages/search/image.vue
index d13844de6a..f60c199f04 100644
--- a/src/pages/search/image.vue
+++ b/src/pages/search/image.vue
@@ -3,7 +3,6 @@
     :images="results"
     :is-single-page="false"
     :fetch-state="fetchState"
-    @shift-tab="handleShiftTab"
   />
 </template>
 
@@ -11,7 +10,6 @@
 import { computed, defineComponent, useMeta } from "@nuxtjs/composition-api"
 
 import { propTypes } from "~/pages/search/search-page.types"
-import { useFocusFilters } from "~/composables/use-focus-filters"
 
 import VImageGrid from "~/components/VImageGrid/VImageGrid.vue"
 
@@ -26,12 +24,7 @@ export default defineComponent({
 
     const results = computed(() => props.resultItems.image)
 
-    const focusFilters = useFocusFilters()
-    const handleShiftTab = () => {
-      focusFilters.focusFilterSidebar()
-    }
-
-    return { handleShiftTab, results }
+    return { results }
   },
   head: {},
 })