From 7372e727d09da9f0b4c704b6f8ae8b2f184a1032 Mon Sep 17 00:00:00 2001
From: Randi Mays <19175324+randimays@users.noreply.github.com>
Date: Wed, 30 Oct 2024 20:04:52 -0500
Subject: [PATCH] Remove next component data attributes

---
 src/templates/common/banners/banner/index.tsx        |  1 -
 .../common/banners/facilityBanner/index.tsx          |  1 -
 .../common/banners/maintenanceBanner/index.tsx       |  1 -
 src/templates/common/banners/promoBanner/index.tsx   |  8 +-------
 src/templates/common/breadcrumbs/index.tsx           |  5 +----
 src/templates/common/button/index.tsx                |  2 +-
 src/templates/common/commonAndPopular/index.tsx      |  5 +----
 src/templates/common/contentFooter/index.tsx         |  1 -
 src/templates/common/featuredContent/index.tsx       |  5 +----
 src/templates/common/footer/index.tsx                |  2 +-
 src/templates/common/googleMapsDirections/index.tsx  |  1 -
 src/templates/common/header/index.tsx                |  6 +-----
 src/templates/common/heading/index.tsx               |  1 -
 src/templates/common/mediaImage/index.tsx            |  1 -
 src/templates/common/preview/index.tsx               |  5 +----
 src/templates/common/relatedLinks/index.tsx          |  5 +----
 src/templates/common/secondaryButtonGroup/index.tsx  | 12 ++----------
 src/templates/common/socialLinks/index.tsx           |  6 +-----
 src/templates/components/accordion/index.tsx         |  2 +-
 src/templates/components/alert/index.tsx             |  1 -
 src/templates/components/alertBlock/index.tsx        |  1 -
 src/templates/components/audienceTopics/index.tsx    |  5 +----
 src/templates/components/collapsiblePanel/index.tsx  |  2 --
 src/templates/components/contactInfo/index.tsx       |  5 +----
 src/templates/components/expandableText/index.tsx    |  6 +-----
 src/templates/components/healthServices/index.tsx    |  1 -
 src/templates/components/hours/index.tsx             |  5 +----
 src/templates/components/imageAndStaticMap/index.tsx |  5 +----
 src/templates/components/linkTeaser/index.tsx        |  6 +-----
 src/templates/components/lovellSwitcher/index.tsx    |  1 -
 src/templates/components/newsStoryTeaser/index.tsx   |  5 +----
 src/templates/components/numberCallout/index.tsx     |  6 +-----
 src/templates/components/personProfile/index.tsx     | 11 ++---------
 .../components/pressReleaseTeaser/index.tsx          |  5 +----
 src/templates/components/processList/index.tsx       |  6 +-----
 .../components/qaCollapsiblePanel/index.test.tsx     |  2 +-
 .../components/qaCollapsiblePanel/index.tsx          |  2 +-
 src/templates/components/qaParagraph/index.tsx       |  2 +-
 src/templates/components/qaSection/index.test.tsx    |  4 ++--
 src/templates/components/qaSection/index.tsx         |  2 +-
 .../components/rateYourExperience/index.tsx          |  5 +----
 src/templates/components/reactWidget/index.tsx       |  1 -
 src/templates/components/servicesList/index.tsx      |  5 +----
 src/templates/components/storyListingLink/index.tsx  |  1 -
 src/templates/components/table/index.tsx             |  5 +----
 src/templates/components/wysiwyg/index.tsx           |  6 +-----
 src/templates/layouts/checklist/index.tsx            |  5 +----
 src/templates/layouts/event/index.tsx                |  5 +----
 src/templates/layouts/eventListing/index.tsx         |  6 +-----
 src/templates/layouts/newsStory/index.tsx            |  5 +----
 src/templates/layouts/pressRelease/index.tsx         |  5 +----
 src/templates/layouts/pressReleaseListing/index.tsx  |  6 +-----
 src/templates/layouts/questionAnswer/index.tsx       |  6 +-----
 src/templates/layouts/resourcesSupport/index.tsx     |  1 -
 src/templates/layouts/staffProfile/index.tsx         |  6 +-----
 src/templates/layouts/storyListing/index.tsx         |  6 +-----
 src/templates/layouts/vetCenter/index.tsx            |  5 +----
 57 files changed, 45 insertions(+), 187 deletions(-)

diff --git a/src/templates/common/banners/banner/index.tsx b/src/templates/common/banners/banner/index.tsx
index 5406060fb..9b5907d33 100644
--- a/src/templates/common/banners/banner/index.tsx
+++ b/src/templates/common/banners/banner/index.tsx
@@ -10,7 +10,6 @@ export const Banner = ({
 }: FormattedBanner): JSX.Element => {
   return (
     <VaBanner
-      data-next-component="templates/common/banners/banner"
       id={id}
       role="region"
       showClose={dismiss ? 'perm' : false}
diff --git a/src/templates/common/banners/facilityBanner/index.tsx b/src/templates/common/banners/facilityBanner/index.tsx
index a21ffc781..ae3ae1858 100644
--- a/src/templates/common/banners/facilityBanner/index.tsx
+++ b/src/templates/common/banners/facilityBanner/index.tsx
@@ -101,7 +101,6 @@ export const FacilityBanner = ({
     <>
       {outputStatus && (
         <VaBanner
-          data-next-component="templates/common/banners/facilityBanner"
           id={id}
           role="region"
           showClose={dismiss}
diff --git a/src/templates/common/banners/maintenanceBanner/index.tsx b/src/templates/common/banners/maintenanceBanner/index.tsx
index b758de53d..d1844ae4b 100644
--- a/src/templates/common/banners/maintenanceBanner/index.tsx
+++ b/src/templates/common/banners/maintenanceBanner/index.tsx
@@ -3,6 +3,5 @@ export const MaintenanceBanner = () => (
     aria-label="Maintenance banner"
     data-widget-type="maintenance-banner"
     role="region"
-    data-next-component="templates/common/banners/maintenanceBanner"
   ></div>
 )
diff --git a/src/templates/common/banners/promoBanner/index.tsx b/src/templates/common/banners/promoBanner/index.tsx
index 9f0bb177c..5a4764793 100644
--- a/src/templates/common/banners/promoBanner/index.tsx
+++ b/src/templates/common/banners/promoBanner/index.tsx
@@ -8,13 +8,7 @@ export const PromoBanner = ({
   alertType,
 }: FormattedPromoBanner): JSX.Element => {
   return (
-    <VaPromoBanner
-      data-next-component="templates/common/banners/promoBanner"
-      id={id}
-      role="region"
-      href={href}
-      type={alertType}
-    >
+    <VaPromoBanner id={id} role="region" href={href} type={alertType}>
       {title}
     </VaPromoBanner>
   )
diff --git a/src/templates/common/breadcrumbs/index.tsx b/src/templates/common/breadcrumbs/index.tsx
index e915f4281..fc5312e9f 100644
--- a/src/templates/common/breadcrumbs/index.tsx
+++ b/src/templates/common/breadcrumbs/index.tsx
@@ -67,10 +67,7 @@ const Breadcrumbs = ({
   const fcString = JSON.stringify(filteredCrumbs)
 
   return (
-    <div
-      className="vads-u-padding-x--1p5"
-      data-next-component="templates/common/breadcrumbs"
-    >
+    <div className="vads-u-padding-x--1p5">
       <va-breadcrumbs class="row" wrapping breadcrumb-list={fcString} />
     </div>
   )
diff --git a/src/templates/common/button/index.tsx b/src/templates/common/button/index.tsx
index 848d7746e..c940b771c 100644
--- a/src/templates/common/button/index.tsx
+++ b/src/templates/common/button/index.tsx
@@ -10,7 +10,7 @@ export function Button({
   return (
     label &&
     url && (
-      <div key={id} data-next-component="templates/common/button">
+      <div key={id}>
         <Link href={url} passHref className="vads-c-action-link--blue">
           {label}
         </Link>
diff --git a/src/templates/common/commonAndPopular/index.tsx b/src/templates/common/commonAndPopular/index.tsx
index 5aea7f40d..f4b2f37bc 100644
--- a/src/templates/common/commonAndPopular/index.tsx
+++ b/src/templates/common/commonAndPopular/index.tsx
@@ -2,10 +2,7 @@ import Link from 'next/link'
 
 export function CommonAndPopular() {
   return (
-    <div
-      className="row vads-u-padding-bottom--9"
-      data-next-component="templates/common/commonAndPopular"
-    >
+    <div className="row vads-u-padding-bottom--9">
       <div className="small-12 usa-width-one-half medium-6 columns">
         <h3 className="va-h-ruled vads-u-margin-bottom--2 vads-u-padding-bottom--1 vads-u-font-size--xl">
           Common Questions
diff --git a/src/templates/common/contentFooter/index.tsx b/src/templates/common/contentFooter/index.tsx
index ebe8e40f0..fe2245a8b 100644
--- a/src/templates/common/contentFooter/index.tsx
+++ b/src/templates/common/contentFooter/index.tsx
@@ -60,7 +60,6 @@ export function ContentFooter({
   return (
     <div
       className={`last-updated usa-content vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0${wrapperClasses}`}
-      data-next-component="templates/common/contentFooter"
     >
       <div className="mobile-lg:vads-u-display--flex above-footer-elements-container">
         {displayDate && machineDate && (
diff --git a/src/templates/common/featuredContent/index.tsx b/src/templates/common/featuredContent/index.tsx
index f4fd98103..9631323c0 100644
--- a/src/templates/common/featuredContent/index.tsx
+++ b/src/templates/common/featuredContent/index.tsx
@@ -7,10 +7,7 @@ export function FeaturedContent({
   link,
 }: ParagraphComponent<FormattedFeaturedContent>) {
   return (
-    <div
-      className="feature featured-content-list-item vads-u-flex--fill vads-u-padding-y--1p5 vads-u-padding-x--1p5 vads-u-margin-bottom--0 medium-screen:vads-u-margin-bottom--2"
-      data-next-component="templates/common/featuredContent"
-    >
+    <div className="feature featured-content-list-item vads-u-flex--fill vads-u-padding-y--1p5 vads-u-padding-x--1p5 vads-u-margin-bottom--0 medium-screen:vads-u-margin-bottom--2">
       {title && (
         <>
           <h3 className="force-small-header vads-u-margin-bottom--2">
diff --git a/src/templates/common/footer/index.tsx b/src/templates/common/footer/index.tsx
index 92784c3b1..e93833516 100644
--- a/src/templates/common/footer/index.tsx
+++ b/src/templates/common/footer/index.tsx
@@ -4,7 +4,7 @@ export const Footer = () => {
   const content = `VA's mission: To fulfill President Lincoln's promise to care for those who have served in our nation's military and for their families, caregivers, and survivors.`
   return (
     <>
-      <footer className="footer" data-next-component="templates/common/footer">
+      <footer className="footer">
         <div
           id="footerNav"
           data-testid="footer"
diff --git a/src/templates/common/googleMapsDirections/index.tsx b/src/templates/common/googleMapsDirections/index.tsx
index 84c583c38..09a1c500b 100644
--- a/src/templates/common/googleMapsDirections/index.tsx
+++ b/src/templates/common/googleMapsDirections/index.tsx
@@ -5,7 +5,6 @@ export const GoogleMapsDirections = ({ title, address }) => {
 
   return (
     <va-link
-      data-next-component="templates/common/googleMapsDirections"
       class="vads-u-display--block vads-u-margin-top--0"
       href={googleMapsUrl}
       name="maps-directions"
diff --git a/src/templates/common/header/index.tsx b/src/templates/common/header/index.tsx
index 87ece452b..ee14d20ce 100644
--- a/src/templates/common/header/index.tsx
+++ b/src/templates/common/header/index.tsx
@@ -3,11 +3,7 @@ import { TopNav } from './TopNav'
 
 export const Header = () => {
   return (
-    <header
-      className="header"
-      role="banner"
-      data-next-component="templates/common/header"
-    >
+    <header className="header" role="banner">
       {/*  Mobile Layout */}
       <div
         data-widget-type="header"
diff --git a/src/templates/common/heading/index.tsx b/src/templates/common/heading/index.tsx
index 91c0bea0c..60309e4cb 100644
--- a/src/templates/common/heading/index.tsx
+++ b/src/templates/common/heading/index.tsx
@@ -8,7 +8,6 @@ export const HeadingElement = ({
   const HeadingElement = headingLevel
   return (
     <HeadingElement
-      data-next-component="templates/common/heading"
       slot={slot}
       dangerouslySetInnerHTML={{ __html: children }}
     ></HeadingElement>
diff --git a/src/templates/common/mediaImage/index.tsx b/src/templates/common/mediaImage/index.tsx
index 011b1e224..e9746830c 100644
--- a/src/templates/common/mediaImage/index.tsx
+++ b/src/templates/common/mediaImage/index.tsx
@@ -59,7 +59,6 @@ export const MediaImage = (
 
   return (
     <Image
-      data-next-component="templates/common/mediaImage"
       id={props.id}
       alt={props.alt}
       src={props.links?.[props.imageStyle]?.href}
diff --git a/src/templates/common/preview/index.tsx b/src/templates/common/preview/index.tsx
index 7c732cf12..26737b41c 100644
--- a/src/templates/common/preview/index.tsx
+++ b/src/templates/common/preview/index.tsx
@@ -37,10 +37,7 @@ export const UnpublishedBanner = ({ resource }) => {
   }
 
   return (
-    <div
-      className="vads-u-background-color--primary-alt-lightest vads-u-padding--1"
-      data-next-component="templates/common/preview"
-    >
+    <div className="vads-u-background-color--primary-alt-lightest vads-u-padding--1">
       <div className="vads-l-grid-container medium-screen:vads-u-padding-x--0">
         You are viewing {modState} revision of {resource?.entityPath}.
         <a
diff --git a/src/templates/common/relatedLinks/index.tsx b/src/templates/common/relatedLinks/index.tsx
index b6aa2493c..8fc92ee8e 100644
--- a/src/templates/common/relatedLinks/index.tsx
+++ b/src/templates/common/relatedLinks/index.tsx
@@ -28,10 +28,7 @@ export const RelatedLinks = ({
   }
 
   return (
-    <section
-      className="vads-u-margin-bottom--3 vads-u-display--flex vads-u-flex-direction--column"
-      data-next-component="templates/common/RelatedLinks"
-    >
+    <section className="vads-u-margin-bottom--3 vads-u-display--flex vads-u-flex-direction--column">
       {sectionTitle && (
         <h2 className="vads-u-margin-y--0 vads-u-font-size--h3">
           {sectionTitle}
diff --git a/src/templates/common/secondaryButtonGroup/index.tsx b/src/templates/common/secondaryButtonGroup/index.tsx
index d333626d8..d62eac734 100644
--- a/src/templates/common/secondaryButtonGroup/index.tsx
+++ b/src/templates/common/secondaryButtonGroup/index.tsx
@@ -9,10 +9,7 @@ export const SecondaryButtonGroup = ({
 }): JSX.Element => {
   if (buttons.length > 1) {
     return (
-      <ul
-        className="vads-u-margin-y--3 usa-unstyled-list"
-        data-next-component="templates/common/secondaryButtonGroup"
-      >
+      <ul className="vads-u-margin-y--3 usa-unstyled-list">
         {buttons?.map((button, index) => (
           <li key={index} className="vads-u-margin-bottom--2">
             <va-link-action
@@ -30,12 +27,7 @@ export const SecondaryButtonGroup = ({
 
   if (button) {
     return (
-      <va-link-action
-        data-next-component="templates/common/secondaryButtonGroup"
-        href={button.url}
-        text={button.label}
-        type="secondary"
-      />
+      <va-link-action href={button.url} text={button.label} type="secondary" />
     )
   }
 
diff --git a/src/templates/common/socialLinks/index.tsx b/src/templates/common/socialLinks/index.tsx
index f8a396458..b70590c14 100644
--- a/src/templates/common/socialLinks/index.tsx
+++ b/src/templates/common/socialLinks/index.tsx
@@ -87,11 +87,7 @@ export const SocialLinks = ({
   ].filter(Boolean)
 
   return (
-    <div
-      data-next-component="templates/common/socialLinks"
-      className={divClass}
-      id="va-c-social-share"
-    >
+    <div className={divClass} id="va-c-social-share">
       <ul className={ulClass} role="list">
         {isEvent && (
           <li className="vads-u-margin-bottom--2p5 ">
diff --git a/src/templates/components/accordion/index.tsx b/src/templates/components/accordion/index.tsx
index 7395286c4..a10be8ebb 100644
--- a/src/templates/components/accordion/index.tsx
+++ b/src/templates/components/accordion/index.tsx
@@ -25,7 +25,7 @@ export function AccordionItem({
 export function Accordion({ id, bordered, items }: FormattedAccordion) {
   if (!items) return null
   return (
-    <div data-next-component="templates/components/accordion">
+    <div>
       <va-accordion bordered={bordered} id={id}>
         {items.map((item) => (
           <AccordionItem key={item.id} {...item} />
diff --git a/src/templates/components/alert/index.tsx b/src/templates/components/alert/index.tsx
index 59ba86a9b..6f62c534b 100644
--- a/src/templates/components/alert/index.tsx
+++ b/src/templates/components/alert/index.tsx
@@ -18,7 +18,6 @@ export function Alert(alert: ParagraphComponent<FormattedAlert>) {
   return (
     <va-alert
       data-paragraph-type="paragraph--alert"
-      data-next-component="templates/components/alert"
       data-entity-id={entityId}
       status={alertType}
       class="vads-u-margin-top--3"
diff --git a/src/templates/components/alertBlock/index.tsx b/src/templates/components/alertBlock/index.tsx
index 7d5da1a1d..33fa6112e 100644
--- a/src/templates/components/alertBlock/index.tsx
+++ b/src/templates/components/alertBlock/index.tsx
@@ -15,7 +15,6 @@ export function AlertBlock(alertBlock: FormattedAlertBlock) {
   return (
     <>
       <VaAlert
-        data-next-component="templates/components/alertBlock"
         id={id}
         status={alertType}
         class="vads-u-margin-top--3"
diff --git a/src/templates/components/audienceTopics/index.tsx b/src/templates/components/audienceTopics/index.tsx
index 971732b01..dd81a401e 100644
--- a/src/templates/components/audienceTopics/index.tsx
+++ b/src/templates/components/audienceTopics/index.tsx
@@ -20,10 +20,7 @@ export function AudienceTopics({
   ))
 
   return (
-    <div
-      className="vads-u-padding-top--3 vads-u-padding-bottom--1p5 vads-u-border-top--1px vads-u-border-bottom--1px vads-u-border-color--gray-light vads-u-display--flex"
-      data-next-component="templates/components/audienceTopics"
-    >
+    <div className="vads-u-padding-top--3 vads-u-padding-bottom--1p5 vads-u-border-top--1px vads-u-border-bottom--1px vads-u-border-color--gray-light vads-u-display--flex">
       <p className="vads-u-margin-y--0 vads-u-font-weight--bold">Tags</p>
       <div className="vads-u-display--flex vads-u-flex-wrap--wrap">
         {tagsList}
diff --git a/src/templates/components/collapsiblePanel/index.tsx b/src/templates/components/collapsiblePanel/index.tsx
index 3935b21dd..8470b435d 100644
--- a/src/templates/components/collapsiblePanel/index.tsx
+++ b/src/templates/components/collapsiblePanel/index.tsx
@@ -34,7 +34,6 @@ export const CollapsiblePanelItem = ({
         id={id}
         data-template="paragraphs/collapsible_panel__panel"
         data-paragraph-type="paragraph--collapsible_panel_item"
-        data-next-component="templates/components/collapsiblePanel/(CollapsiblePanelItem)"
         data-entity-id={entityId}
         data-analytics-faq-text={escape(title)}
       >
@@ -63,7 +62,6 @@ export const CollapsiblePanel = ({
     <div
       id={id}
       data-paragraph-type="paragraph--collapsible_panel"
-      data-next-component="templates/components/collapsiblePanel/(CollapsiblePanel)"
       data-entity-id={entityId}
       data-multiselectable={multiSelect}
     >
diff --git a/src/templates/components/contactInfo/index.tsx b/src/templates/components/contactInfo/index.tsx
index dd34c3e42..3f898d4ac 100644
--- a/src/templates/components/contactInfo/index.tsx
+++ b/src/templates/components/contactInfo/index.tsx
@@ -98,10 +98,7 @@ export function ContactInfo({
     contactType === 'DC' && defaultContact && !additionalContact
 
   return (
-    <div
-      data-next-component="templates/components/contactInfo"
-      className="vads-u-background-color--gray-light-alt"
-    >
+    <div className="vads-u-background-color--gray-light-alt">
       <div className="usa-grid usa-grid-full">
         <div className="usa-width-three-fourths">
           <div className="usa-content vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0">
diff --git a/src/templates/components/expandableText/index.tsx b/src/templates/components/expandableText/index.tsx
index 92cc5e90f..06ad28b9a 100644
--- a/src/templates/components/expandableText/index.tsx
+++ b/src/templates/components/expandableText/index.tsx
@@ -11,11 +11,7 @@ export function ExpandableText({
   if (isEmpty(header)) return
 
   return (
-    <VaAlertExpandable
-      id={id}
-      trigger={header}
-      data-next-component="templates/components/expandableText"
-    >
+    <VaAlertExpandable id={id} trigger={header}>
       {text && (
         <div
           dangerouslySetInnerHTML={{
diff --git a/src/templates/components/healthServices/index.tsx b/src/templates/components/healthServices/index.tsx
index f714a5890..1f54d9ed7 100644
--- a/src/templates/components/healthServices/index.tsx
+++ b/src/templates/components/healthServices/index.tsx
@@ -22,7 +22,6 @@ function HealthServices({ services, typeOfCare }: HealthServicesProps) {
       <h2
         id={typeOfCare}
         className="vads-u-margin-top--0 vads-u-font-size--lg mobile-lg:vads-u-font-size--xl vads-u-margin-bottom--2"
-        data-next-component="templates/components/healthServices"
       >
         {heading}
       </h2>
diff --git a/src/templates/components/hours/index.tsx b/src/templates/components/hours/index.tsx
index 8d1ee2d5f..878d7d851 100644
--- a/src/templates/components/hours/index.tsx
+++ b/src/templates/components/hours/index.tsx
@@ -63,10 +63,7 @@ export const Hours = ({ allHours, headerType }: HoursProps) => {
   }
 
   return (
-    <div
-      className="vads-u-margin-bottom--0"
-      data-next-component="templates/components/hours"
-    >
+    <div className="vads-u-margin-bottom--0">
       <div className="clinicalhours">
         {renderHeader()}
         <div className="vads-u-display--flex vads-u-flex-direction--column mobile-lg:vads-u-flex-direction--row vads-u-margin-bottom--0">
diff --git a/src/templates/components/imageAndStaticMap/index.tsx b/src/templates/components/imageAndStaticMap/index.tsx
index 73067e719..7636c5a73 100644
--- a/src/templates/components/imageAndStaticMap/index.tsx
+++ b/src/templates/components/imageAndStaticMap/index.tsx
@@ -13,10 +13,7 @@ export const ImageAndStaticMap: React.FC<ImageAndStaticMapProps> = ({
   facilityId,
 }) => {
   return (
-    <div
-      className="usa-width-one-third inline-table-helper vads-u-order--first mobile-lg:vads-u-order--initial vads-u-margin-bottom--2 vads-u-margin-left--auto facility"
-      data-next-component="templates/components/imageAndStaticMap"
-    >
+    <div className="usa-width-one-third inline-table-helper vads-u-order--first mobile-lg:vads-u-order--initial vads-u-margin-bottom--2 vads-u-margin-left--auto facility">
       <div
         onClick={() =>
           recordEvent({ event: 'image-click', 'facility-name': facilityId })
diff --git a/src/templates/components/linkTeaser/index.tsx b/src/templates/components/linkTeaser/index.tsx
index a8d90f813..26fd710dd 100644
--- a/src/templates/components/linkTeaser/index.tsx
+++ b/src/templates/components/linkTeaser/index.tsx
@@ -63,11 +63,7 @@ export const LinkTeaser = ({
   }
 
   return (
-    <li
-      key={id}
-      onClick={() => recordEvent(analytic)}
-      data-next-component="templates/components/linkTeaser"
-    >
+    <li key={id} onClick={() => recordEvent(analytic)}>
       {title !== '' && (
         <h3 className="va-nav-linkslist-title vads-u-font-size--h4">
           <a
diff --git a/src/templates/components/lovellSwitcher/index.tsx b/src/templates/components/lovellSwitcher/index.tsx
index f94982668..d7bf4f0fe 100644
--- a/src/templates/components/lovellSwitcher/index.tsx
+++ b/src/templates/components/lovellSwitcher/index.tsx
@@ -22,7 +22,6 @@ export function LovellSwitcher({
       status="warning"
       class="vads-u-margin-bottom--2"
       id="va-info-alert"
-      data-next-component="templates/components/lovellSwitcher"
     >
       <h2 slot="headline">
         You are viewing this page as a {currentVariant.toUpperCase()}{' '}
diff --git a/src/templates/components/newsStoryTeaser/index.tsx b/src/templates/components/newsStoryTeaser/index.tsx
index 9a6b435eb..a4828e251 100644
--- a/src/templates/components/newsStoryTeaser/index.tsx
+++ b/src/templates/components/newsStoryTeaser/index.tsx
@@ -17,10 +17,7 @@ export const NewsStoryTeaser = ({
 
   return (
     <>
-      <div
-        className="usa-grid usa-grid-full vads-u-margin-bottom--3 medium-screen:vads-u-margin-bottom--4 vads-u-display--flex vads-u-flex-direction--column medium-screen:vads-u-flex-direction--row"
-        data-next-component="templates/components/newsStoryTeaser"
-      >
+      <div className="usa-grid usa-grid-full vads-u-margin-bottom--3 medium-screen:vads-u-margin-bottom--4 vads-u-display--flex vads-u-flex-direction--column medium-screen:vads-u-flex-direction--row">
         <div className="usa-width-two-thirds">
           <TitleTag className="vads-u-font-size--md medium-screen:vads-u-font-size--lg medium-screen:vads-u-margin-bottom--0p5">
             <va-link href={link} text={title}>
diff --git a/src/templates/components/numberCallout/index.tsx b/src/templates/components/numberCallout/index.tsx
index 191acab56..0ce49eb63 100644
--- a/src/templates/components/numberCallout/index.tsx
+++ b/src/templates/components/numberCallout/index.tsx
@@ -6,11 +6,7 @@ export function NumberCallout({
   description,
 }: FormattedNumberCallout) {
   return (
-    <div
-      data-next-component="templates/components/numberCallout"
-      data-entity-id={entityId}
-      className="card information"
-    >
+    <div data-entity-id={entityId} className="card information">
       <span className="number">{numberPhrase}</span>
       <span className="description">{description}</span>
     </div>
diff --git a/src/templates/components/personProfile/index.tsx b/src/templates/components/personProfile/index.tsx
index b62691d93..b63cf25b9 100644
--- a/src/templates/components/personProfile/index.tsx
+++ b/src/templates/components/personProfile/index.tsx
@@ -23,11 +23,7 @@ export const PersonProfile = ({
   office,
 }: FormattedPersonProfile): JSX.Element => {
   return (
-    <div
-      id="content"
-      className="interior"
-      data-next-component="templates/components/personProfile/(PersonProfile)"
-    >
+    <div id="content" className="interior">
       <main className="va-l-detail-page va-facility-page">
         <div className="usa-grid usa-grid-full">
           <div className="usa-width-three-fourths">
@@ -140,10 +136,7 @@ export const StaffNewsProfile = ({
   description,
 }: PersonProfileTeaserProps): JSX.Element => {
   return (
-    <div
-      className="vads-u-font-size--sm vads-u-margin-bottom--2p5"
-      data-next-component="templates/components/personProfile/(StaffNewsProfile)"
-    >
+    <div className="vads-u-font-size--sm vads-u-margin-bottom--2p5">
       <div className="vads-u-margin-bottom--0p5 vads-u-font-weight--bold">
         By {title}
         {description ? `, ${description}` : null}
diff --git a/src/templates/components/pressReleaseTeaser/index.tsx b/src/templates/components/pressReleaseTeaser/index.tsx
index 24de7cfcc..bc6d2f2f3 100644
--- a/src/templates/components/pressReleaseTeaser/index.tsx
+++ b/src/templates/components/pressReleaseTeaser/index.tsx
@@ -18,10 +18,7 @@ export function PressReleaseTeaser({
 
   return (
     <>
-      <section
-        className="vads-u-margin-bottom--4"
-        data-next-component="templates/components/pressReleaseTeaser"
-      >
+      <section className="vads-u-margin-bottom--4">
         <TitleTag className="vads-u-margin-bottom--1p5 vads-u-font-size--md medium-screen:vads-u-font-size--lg">
           <va-link href={link} text={title}>
             {title}
diff --git a/src/templates/components/processList/index.tsx b/src/templates/components/processList/index.tsx
index 288e9d109..2e9727962 100644
--- a/src/templates/components/processList/index.tsx
+++ b/src/templates/components/processList/index.tsx
@@ -3,11 +3,7 @@ import { numToWord } from '@/lib/utils/helpers'
 export function ProcessList({ steps, entityId }: FormattedProcessList) {
   if (!steps) return
   return (
-    <div
-      data-next-component="templates/components/processList"
-      data-entity-id={entityId}
-      className="process schemaform-process"
-    >
+    <div data-entity-id={entityId} className="process schemaform-process">
       <ol>
         {steps &&
           steps.map((step, index) => (
diff --git a/src/templates/components/qaCollapsiblePanel/index.test.tsx b/src/templates/components/qaCollapsiblePanel/index.test.tsx
index 6843b8296..22a2c0594 100644
--- a/src/templates/components/qaCollapsiblePanel/index.test.tsx
+++ b/src/templates/components/qaCollapsiblePanel/index.test.tsx
@@ -25,7 +25,7 @@ describe('QaCollapsiblePanel with valid data', () => {
     render(<QaCollapsiblePanel questions={questionsData} />)
 
     const panelDiv = document.querySelector(
-      'div[data-next-component="templates/components/qaCollapsiblePanel"]'
+      'div[data-template="paragraphs/q_a.collapsible_panel"]'
     )
     expect(panelDiv).toBeInTheDocument()
   })
diff --git a/src/templates/components/qaCollapsiblePanel/index.tsx b/src/templates/components/qaCollapsiblePanel/index.tsx
index 2817d87fe..f2e041ac3 100644
--- a/src/templates/components/qaCollapsiblePanel/index.tsx
+++ b/src/templates/components/qaCollapsiblePanel/index.tsx
@@ -1,6 +1,6 @@
 export const QaCollapsiblePanel = ({ questions }) => {
   return (
-    <div data-next-component="templates/components/qaCollapsiblePanel">
+    <div data-template="paragraphs/q_a.collapsible_panel">
       <va-accordion>
         {questions.map((questionObject) => (
           <va-accordion-item
diff --git a/src/templates/components/qaParagraph/index.tsx b/src/templates/components/qaParagraph/index.tsx
index cc79b4cc9..2e9109645 100644
--- a/src/templates/components/qaParagraph/index.tsx
+++ b/src/templates/components/qaParagraph/index.tsx
@@ -8,7 +8,7 @@ export function QaParagraph({
 }: FormattedQaParagraph) {
   const DynamicHeader = setHeaderh3 ? 'h3' : 'h2'
   return (
-    <div data-next-component="templates/components/qaParagraph">
+    <div>
       <div>
         <div className="vads-u-display--flex">
           <DynamicHeader>{question}</DynamicHeader>
diff --git a/src/templates/components/qaSection/index.test.tsx b/src/templates/components/qaSection/index.test.tsx
index bfb08e82f..95d8bd9a6 100644
--- a/src/templates/components/qaSection/index.test.tsx
+++ b/src/templates/components/qaSection/index.test.tsx
@@ -60,7 +60,7 @@ describe('QaSection with with valid data', () => {
   test('renders QaSection component with accordion', () => {
     render(<QaSection {...QaSectionAccordionProps} />)
     const accordionDiv = document.querySelector(
-      'div[data-next-component="templates/components/qaCollapsiblePanel"]'
+      'div[data-template="paragraphs/q_a.collapsible_panel"]'
     )
     expect(accordionDiv).toBeInTheDocument()
     expect(screen.queryByText(/Accordion test header/)).toBeInTheDocument()
@@ -69,7 +69,7 @@ describe('QaSection with with valid data', () => {
   test('renders QaSection component without accordion', () => {
     render(<QaSection {...QaSectionOtherProps} />)
     const accordionDiv = document.querySelector(
-      'div[data-next-component="templates/components/qaCollapsiblePanel"]'
+      'div[data-template="paragraphs/q_a.collapsible_panel"]'
     )
     expect(accordionDiv).not.toBeInTheDocument()
     expect(screen.queryByText(/Other test header/)).toBeInTheDocument()
diff --git a/src/templates/components/qaSection/index.tsx b/src/templates/components/qaSection/index.tsx
index 6f78f427c..0f991a98f 100644
--- a/src/templates/components/qaSection/index.tsx
+++ b/src/templates/components/qaSection/index.tsx
@@ -12,7 +12,7 @@ export function QaSection({
 }: FormattedQaSection | FormattedQaGroup) {
   const setHeaderh3 = header ? true : false
   return (
-    <div data-next-component="templates/components/qaSection">
+    <div>
       {header && <h2>{header}</h2>}
       {intro && <p>{intro}</p>}
       {displayAccordion ? (
diff --git a/src/templates/components/rateYourExperience/index.tsx b/src/templates/components/rateYourExperience/index.tsx
index 2a23b340c..aaf535c7c 100644
--- a/src/templates/components/rateYourExperience/index.tsx
+++ b/src/templates/components/rateYourExperience/index.tsx
@@ -49,10 +49,7 @@ export const RateYourExperience = () => {
   }
 
   return (
-    <form
-      className="vads-u-margin-top--3 vads-u-margin-bottom--4 vads-u-display--flex vads-u-flex-direction--column"
-      data-next-component="templates/components/rateYourExperience"
-    >
+    <form className="vads-u-margin-top--3 vads-u-margin-bottom--4 vads-u-display--flex vads-u-flex-direction--column">
       <VaRadio
         error={isError ? 'Please select an answer' : ''}
         aria-hidden={isSubmitted}
diff --git a/src/templates/components/reactWidget/index.tsx b/src/templates/components/reactWidget/index.tsx
index 74f6fd4a8..423ab4a12 100644
--- a/src/templates/components/reactWidget/index.tsx
+++ b/src/templates/components/reactWidget/index.tsx
@@ -80,7 +80,6 @@ const DefaultWidget = ({
 }) => {
   return (
     <div
-      data-next-component="templates/components/reactWidget"
       data-entity-id={entityId}
       data-widget-type={widgetType}
       data-widget-timeout={timeout}
diff --git a/src/templates/components/servicesList/index.tsx b/src/templates/components/servicesList/index.tsx
index 9c3aa9048..890d03b0d 100644
--- a/src/templates/components/servicesList/index.tsx
+++ b/src/templates/components/servicesList/index.tsx
@@ -9,10 +9,7 @@ interface ServicesListProps {
 function ServicesList({ services }: ServicesListProps) {
   if (!services) return null
   return (
-    <div
-      className="vads-u-margin-bottom--3"
-      data-next-component="templates/components/servicesList"
-    >
+    <div className="vads-u-margin-bottom--3">
       <va-accordion bordered>
         {services.map((service, index) => (
           <va-accordion-item
diff --git a/src/templates/components/storyListingLink/index.tsx b/src/templates/components/storyListingLink/index.tsx
index d267a8bdc..cac0e79c2 100644
--- a/src/templates/components/storyListingLink/index.tsx
+++ b/src/templates/components/storyListingLink/index.tsx
@@ -5,7 +5,6 @@ export const StoryListingLink = ({ path }: FormattedStoryListingLink) => {
   return (
     // @todo can <Link /> be used here?
     <a
-      data-next-component="templates/components/storyListingLink"
       onClick={() =>
         recordEvent({
           event: 'nav-secondary-button-click',
diff --git a/src/templates/components/table/index.tsx b/src/templates/components/table/index.tsx
index fa2d5c1a9..b7c87abff 100644
--- a/src/templates/components/table/index.tsx
+++ b/src/templates/components/table/index.tsx
@@ -13,10 +13,7 @@ export function Table({
   if (isEmpty(data)) return
 
   return (
-    <VaTable
-      data-next-component="templates/components/table"
-      table-title={title}
-    >
+    <VaTable table-title={title}>
       {data.map((tableRow: string[], tableRowIndex) => (
         <VaTableRow
           key={tableRowIndex}
diff --git a/src/templates/components/wysiwyg/index.tsx b/src/templates/components/wysiwyg/index.tsx
index bd32d239a..cf55ac325 100644
--- a/src/templates/components/wysiwyg/index.tsx
+++ b/src/templates/components/wysiwyg/index.tsx
@@ -31,11 +31,7 @@ export function Wysiwyg({
   if (!isValidData(html)) return
 
   return (
-    <div
-      data-entity-id={entityId}
-      data-paragraph-type="paragraph--wysiwyg"
-      data-next-component="templates/components/wysiwyg"
-    >
+    <div data-entity-id={entityId} data-paragraph-type="paragraph--wysiwyg">
       <WysiwygField html={html} />
     </div>
   )
diff --git a/src/templates/layouts/checklist/index.tsx b/src/templates/layouts/checklist/index.tsx
index 0fc9b92cc..d8ab77dd7 100644
--- a/src/templates/layouts/checklist/index.tsx
+++ b/src/templates/layouts/checklist/index.tsx
@@ -22,10 +22,7 @@ export function Checklist({
   title,
 }: FormattedChecklist) {
   return (
-    <main
-      className="va-l-detail-page"
-      data-next-component="templates/layouts/checklist"
-    >
+    <main className="va-l-detail-page">
       <div className="usa-grid usa-grid-full vads-u-padding-x--1 desktop-lg:vads-u-padding-x--0">
         <div className="usa-width-three-fourths">
           <div className="usa-content">
diff --git a/src/templates/layouts/event/index.tsx b/src/templates/layouts/event/index.tsx
index 30448f9d1..95aeb2bc8 100644
--- a/src/templates/layouts/event/index.tsx
+++ b/src/templates/layouts/event/index.tsx
@@ -76,10 +76,7 @@ export const Event = ({
     .join(', ')
 
   return (
-    <div
-      className="va-l-detail-page va-facility-page"
-      data-next-component="templates/layouts/event"
-    >
+    <div className="va-l-detail-page va-facility-page">
       <div className="usa-grid usa-grid-full">
         <div className="vads-u-display--flex vads-u-flex-direction--column vads-u-padding-x--1p5 desktop-lg:vads-u-padding-x--0 vads-u-padding-bottom--2">
           {/* Title */}
diff --git a/src/templates/layouts/eventListing/index.tsx b/src/templates/layouts/eventListing/index.tsx
index 654054a31..278b1798f 100644
--- a/src/templates/layouts/eventListing/index.tsx
+++ b/src/templates/layouts/eventListing/index.tsx
@@ -44,11 +44,7 @@ export function EventListing({
 
   return (
     <>
-      <div
-        key={id}
-        className="usa-grid usa-grid-full vads-u-padding-bottom--3"
-        data-next-component="templates/layouts/eventListing"
-      >
+      <div key={id} className="usa-grid usa-grid-full vads-u-padding-bottom--3">
         {/* Widget coming from vets-website */}
         {menu && (
           <nav
diff --git a/src/templates/layouts/newsStory/index.tsx b/src/templates/layouts/newsStory/index.tsx
index 8ae86c317..06e82f963 100644
--- a/src/templates/layouts/newsStory/index.tsx
+++ b/src/templates/layouts/newsStory/index.tsx
@@ -27,10 +27,7 @@ export const NewsStory = ({
 
   return (
     <>
-      <div
-        className="va-l-detail-page va-facility-page"
-        data-next-component="templates/layouts/newsStory"
-      >
+      <div className="va-l-detail-page va-facility-page">
         <div className="usa-grid usa-grid-full">
           {/* nav here */}
           <div className="usa-width-three-fourths">
diff --git a/src/templates/layouts/pressRelease/index.tsx b/src/templates/layouts/pressRelease/index.tsx
index 284ee6683..15ea3ab26 100644
--- a/src/templates/layouts/pressRelease/index.tsx
+++ b/src/templates/layouts/pressRelease/index.tsx
@@ -21,10 +21,7 @@ export const PressRelease = ({
   return (
     <>
       <div>
-        <div
-          className="va-l-detail-page va-facility-page"
-          data-next-component="templates/layouts/pressRelease"
-        >
+        <div className="va-l-detail-page va-facility-page">
           <div className="usa-grid usa-grid-full">
             {/* nav here */}
             <div className="usa-width-three-fourths">
diff --git a/src/templates/layouts/pressReleaseListing/index.tsx b/src/templates/layouts/pressReleaseListing/index.tsx
index 37abf44d2..3d6330bc0 100644
--- a/src/templates/layouts/pressReleaseListing/index.tsx
+++ b/src/templates/layouts/pressReleaseListing/index.tsx
@@ -54,11 +54,7 @@ export function PressReleaseListing({
     )
 
   return (
-    <div
-      key={id}
-      className="usa-grid usa-grid-full"
-      data-next-component="templates/layouts/pressReleaseListing"
-    >
+    <div key={id} className="usa-grid usa-grid-full">
       {/* Widget coming from vets-website */}
       <nav
         data-template="navigation/facility_sidebar_nav"
diff --git a/src/templates/layouts/questionAnswer/index.tsx b/src/templates/layouts/questionAnswer/index.tsx
index 79e9abd2f..60a6f05f6 100644
--- a/src/templates/layouts/questionAnswer/index.tsx
+++ b/src/templates/layouts/questionAnswer/index.tsx
@@ -42,11 +42,7 @@ export const QuestionAnswer = ({
     }
   }
   return (
-    <div
-      id="content"
-      className="interior"
-      data-next-component="templates/layouts/questionAnswer"
-    >
+    <div id="content" className="interior">
       <div className="va-l-detail-page">
         <div className="usa-grid usa-grid-full">
           <div className="usa-width-three-fourths">
diff --git a/src/templates/layouts/resourcesSupport/index.tsx b/src/templates/layouts/resourcesSupport/index.tsx
index a42384b8a..173e95009 100644
--- a/src/templates/layouts/resourcesSupport/index.tsx
+++ b/src/templates/layouts/resourcesSupport/index.tsx
@@ -48,7 +48,6 @@ export const ResourcesSupport = ({
       id="content"
       className="interior"
       data-resource-type="node--support_resources_detail_page"
-      data-next-component="templates/layouts/resourcesSupport"
     >
       <main className="va-l-detail-page">
         <div className="usa-grid usa-grid-full">
diff --git a/src/templates/layouts/staffProfile/index.tsx b/src/templates/layouts/staffProfile/index.tsx
index 08d8b8db1..6d6a02bc3 100644
--- a/src/templates/layouts/staffProfile/index.tsx
+++ b/src/templates/layouts/staffProfile/index.tsx
@@ -12,11 +12,7 @@ export function StaffProfile({
   email,
 }: FormattedStaffProfile) {
   return (
-    <article
-      key={id}
-      className="usa-content"
-      data-next-component="templates/layouts/staffProfile"
-    >
+    <article key={id} className="usa-content">
       <div className="vads-u-display--flex vads-u-margin-bottom--4 vads-u-flex-direction--column medium-screen:vads-u-flex-direction--row">
         {!thumbnail ? (
           <div className="vads-u-flex--auto medium-screen:vads-u-margin-right--3 vads-u-margin-bottom--2 medium-screen:vads-u-margin-bottom--0">
diff --git a/src/templates/layouts/storyListing/index.tsx b/src/templates/layouts/storyListing/index.tsx
index c771e0179..5a57615b0 100644
--- a/src/templates/layouts/storyListing/index.tsx
+++ b/src/templates/layouts/storyListing/index.tsx
@@ -53,11 +53,7 @@ export function StoryListing({
     )
 
   return (
-    <div
-      key={id}
-      className="usa-grid usa-grid-full"
-      data-next-component="templates/layouts/storyListing"
-    >
+    <div key={id} className="usa-grid usa-grid-full">
       {/* Widget coming from vets-website */}
       <nav
         data-template="navigation/facility_sidebar_nav"
diff --git a/src/templates/layouts/vetCenter/index.tsx b/src/templates/layouts/vetCenter/index.tsx
index 8ee253833..0c063b102 100644
--- a/src/templates/layouts/vetCenter/index.tsx
+++ b/src/templates/layouts/vetCenter/index.tsx
@@ -156,10 +156,7 @@ export function VetCenter({
   }
 
   return (
-    <div
-      className="usa-grid usa-grid-full"
-      data-next-component="templates/layouts/vetCenter"
-    >
+    <div className="usa-grid usa-grid-full">
       <div className="usa-width-three-fourths">
         <article className="usa-content va-l-facility-detail vads-u-padding-bottom--0">
           {title && (