diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css
index 5b7a119b5..916af26ce 100644
--- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css
+++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-button.css
@@ -8,12 +8,4 @@ main > .container   .c-button--is-active {
 
   /* FAQ: Design shows 10px font */
   font-size: var(--global-font-size--x-small);
-}
-
-/* TODO: Remove from c-button (once it becomes redundant there) */
-/* FAQ: This is now added in generics/attributes.css */
-/*
-[disabled] {
-  pointer-events: none;
-}
-*/
+}
\ No newline at end of file
diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css
deleted file mode 100644
index 5fc9012e1..000000000
--- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/generics/attributes.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/* To render data-prefix value as prefixed text */
-[data-prefix]::before {
-  display: inline-block;
-  content: attr(data-prefix);
-  margin-right: 0.25ch;
-
-  text-transform: none;
-}
-
-/* TODO: Remove from c-button in Core-Styles */
-[disabled] {
-  pointer-events: none;
-}
diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css
index 8bfc4d0d6..306b7be08 100644
--- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css
+++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css
@@ -5,7 +5,7 @@
 /* … */
 
 /* GENERICS */
-@import url("./for-core-styles/generics/attributes.css") layer(base);
+/* … */
 
 /* ELEMENTS */
 /* … */
diff --git a/apps/tup-ui/src/main.global.for-core-styles.css b/apps/tup-ui/src/main.global.for-core-styles.css
index f54d0de31..f173dc2e2 100644
--- a/apps/tup-ui/src/main.global.for-core-styles.css
+++ b/apps/tup-ui/src/main.global.for-core-styles.css
@@ -44,16 +44,6 @@ hr {
   height: 16px;
 }
 
-/* TODO: Remove this after:
-         0. attributes.css is migrated to Core-Styles
-         1. attributes.css is loaded by Portal */
-[data-prefix]::before {
-  display: inline-block;
-  content: attr(data-prefix);
-  margin-right: 0.25ch;
-  text-transform: none;
-}
-
 /* TODO: Remove this after:
          0. CEP v2 colors are removed from Core-Styles settings/color--portal */
 #page-portal main /* i.e. global-safe :root */ {