diff --git a/core/src/components/picker-column/picker-column-interfaces.ts b/core/src/components/picker-column/picker-column-interfaces.ts
index e6f811502b..a37d9b97f6 100644
--- a/core/src/components/picker-column/picker-column-interfaces.ts
+++ b/core/src/components/picker-column/picker-column-interfaces.ts
@@ -1,3 +1,4 @@
+// TODO FW-5580 remove this
 export interface PickerColumnItem {
   text: string;
   value: string | number;
diff --git a/core/src/components/picker-column/picker-column.md.scss b/core/src/components/picker-column/picker-column.md.scss
index 2247139a83..1dcd05efee 100644
--- a/core/src/components/picker-column/picker-column.md.scss
+++ b/core/src/components/picker-column/picker-column.md.scss
@@ -1,6 +1,7 @@
 @import "./picker-column.scss";
 @import "../../themes/ionic.globals.md";
 
+// TODO FW-5580 remove this
 :host .picker-item-active {
   color: current-color(base);
 }
diff --git a/core/src/components/picker-column/picker-column.scss b/core/src/components/picker-column/picker-column.scss
index b30cc70825..45953071c4 100644
--- a/core/src/components/picker-column/picker-column.scss
+++ b/core/src/components/picker-column/picker-column.scss
@@ -44,6 +44,7 @@
   scroll-snap-align: none;
 }
 
+// TODO FW-5580 remove this
 :host .picker-item {
   @include padding(0);
   @include margin(0);
@@ -81,11 +82,14 @@
   scroll-snap-align: center;
 }
 
+// TODO FW-5580 remove this.
+// Figure out if we still need the .picker-item-empty selector
 :host .picker-item-empty,
 :host .picker-item[disabled] {
   cursor: default;
 }
 
+// TODO FW-5580 remove this
 :host .picker-item-empty,
 :host(:not([disabled])) .picker-item[disabled] {
   scroll-snap-align: none;
@@ -95,10 +99,12 @@
   overflow-y: hidden;
 }
 
+// TODO FW-5580 remove this
 :host .picker-item[disabled] {
   opacity: 0.4;
 }
 
+// TODO FW-5580 remove this
 :host(.picker-column-active) .picker-item.picker-item-active {
   color: current-color(base);
 }
diff --git a/core/src/components/picker-column/picker-column.tsx b/core/src/components/picker-column/picker-column.tsx
index 4c31b5bc4e..0c44a4abe8 100644
--- a/core/src/components/picker-column/picker-column.tsx
+++ b/core/src/components/picker-column/picker-column.tsx
@@ -14,6 +14,8 @@ import type { PickerColumnItem } from './picker-column-interfaces';
 /**
  * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use.
  */
+// TODO FW-5580 we can likely go back to a single stylesheet here
+// the per-mode styles were moved to ion-picker-column-option
 @Component({
   tag: 'ion-picker-column',
   styleUrls: {