diff --git a/plugins/woocommerce/changelog/spotfix-cleanup-legacy-wca-comments b/plugins/woocommerce/changelog/spotfix-cleanup-legacy-wca-comments
new file mode 100644
index 00000000000..b0c4e4ea650
--- /dev/null
+++ b/plugins/woocommerce/changelog/spotfix-cleanup-legacy-wca-comments
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: No functional change, just some housekeeping.
+
+
diff --git a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Init.php b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Init.php
index a60e990336c..b2be20cff7f 100644
--- a/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Init.php
+++ b/plugins/woocommerce/src/Admin/Features/OnboardingTasks/Init.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Onboarding Tasks
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Admin\Features\OnboardingTasks;
diff --git a/plugins/woocommerce/src/Admin/Features/TransientNotices.php b/plugins/woocommerce/src/Admin/Features/TransientNotices.php
index a0d909d469c..744fae0cee5 100644
--- a/plugins/woocommerce/src/Admin/Features/TransientNotices.php
+++ b/plugins/woocommerce/src/Admin/Features/TransientNotices.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Transient Notices
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Admin\Features;
diff --git a/plugins/woocommerce/src/Internal/Admin/ActivityPanels.php b/plugins/woocommerce/src/Internal/Admin/ActivityPanels.php
index 859b8289bd9..4e28cc0aac6 100644
--- a/plugins/woocommerce/src/Internal/Admin/ActivityPanels.php
+++ b/plugins/woocommerce/src/Internal/Admin/ActivityPanels.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Activity Panel.
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;
diff --git a/plugins/woocommerce/src/Internal/Admin/Analytics.php b/plugins/woocommerce/src/Internal/Admin/Analytics.php
index 979f0b35851..b12ee48d96d 100644
--- a/plugins/woocommerce/src/Internal/Admin/Analytics.php
+++ b/plugins/woocommerce/src/Internal/Admin/Analytics.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Analytics.
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;
diff --git a/plugins/woocommerce/src/Internal/Admin/Coupons.php b/plugins/woocommerce/src/Internal/Admin/Coupons.php
index 955832374c0..330fd746f6a 100644
--- a/plugins/woocommerce/src/Internal/Admin/Coupons.php
+++ b/plugins/woocommerce/src/Internal/Admin/Coupons.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * WooCommerce Marketing > Coupons.
- *
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;
diff --git a/plugins/woocommerce/src/Internal/Admin/Events.php b/plugins/woocommerce/src/Internal/Admin/Events.php
index f91f635cceb..16517518c5e 100644
--- a/plugins/woocommerce/src/Internal/Admin/Events.php
+++ b/plugins/woocommerce/src/Internal/Admin/Events.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * Handle cron events.
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;
diff --git a/plugins/woocommerce/src/Internal/Admin/Homescreen.php b/plugins/woocommerce/src/Internal/Admin/Homescreen.php
index a8f8d6ce4e5..04d0fcf0f5e 100644
--- a/plugins/woocommerce/src/Internal/Admin/Homescreen.php
+++ b/plugins/woocommerce/src/Internal/Admin/Homescreen.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Homescreen.
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;
diff --git a/plugins/woocommerce/src/Internal/Admin/Loader.php b/plugins/woocommerce/src/Internal/Admin/Loader.php
index d3508935e1c..6d12487a693 100644
--- a/plugins/woocommerce/src/Internal/Admin/Loader.php
+++ b/plugins/woocommerce/src/Internal/Admin/Loader.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * Register the scripts, styles, and includes needed for pieces of the WooCommerce Admin experience.
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;
diff --git a/plugins/woocommerce/src/Internal/Admin/Marketing.php b/plugins/woocommerce/src/Internal/Admin/Marketing.php
index 5c294a37659..ca839a0f427 100644
--- a/plugins/woocommerce/src/Internal/Admin/Marketing.php
+++ b/plugins/woocommerce/src/Internal/Admin/Marketing.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Marketing.
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/Onboarding.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/Onboarding.php
index 605d1ae8a2f..2439ddd8610 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/Onboarding.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/Onboarding.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Onboarding
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin\Onboarding;
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingHelper.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingHelper.php
index bce1e76d562..3cfb70b6d77 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingHelper.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingHelper.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Onboarding Helper
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin\Onboarding;
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingIndustries.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingIndustries.php
index 16da26059fd..0aa8287ae6c 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingIndustries.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingIndustries.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Onboarding Industries
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin\Onboarding;
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingJetpack.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingJetpack.php
index 8ef341c2ce3..b115aebb3ae 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingJetpack.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingJetpack.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Onboarding Jetpack
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin\Onboarding;
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingMailchimp.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingMailchimp.php
index a315a6503a4..8a55ec8120e 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingMailchimp.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingMailchimp.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Onboarding Mailchimp
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin\Onboarding;
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProducts.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProducts.php
index f707f733f86..9aff493b664 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProducts.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProducts.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Onboarding Products
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin\Onboarding;
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProfile.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProfile.php
index 6f9bd98bd67..2c058c54a0e 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProfile.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingProfile.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Onboarding Setup Wizard
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin\Onboarding;
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingSetupWizard.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingSetupWizard.php
index df8b3560da0..1435079dd16 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingSetupWizard.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingSetupWizard.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Onboarding Setup Wizard
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin\Onboarding;
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingSync.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingSync.php
index 113b838e753..fca4afe7c80 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingSync.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingSync.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Onboarding
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin\Onboarding;
diff --git a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingThemes.php b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingThemes.php
index 03fab701815..b5ed5636413 100644
--- a/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingThemes.php
+++ b/plugins/woocommerce/src/Internal/Admin/Onboarding/OnboardingThemes.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Onboarding Themes
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin\Onboarding;
diff --git a/plugins/woocommerce/src/Internal/Admin/RemoteInboxNotifications.php b/plugins/woocommerce/src/Internal/Admin/RemoteInboxNotifications.php
index eefd9ad09a9..c71a8fba13d 100644
--- a/plugins/woocommerce/src/Internal/Admin/RemoteInboxNotifications.php
+++ b/plugins/woocommerce/src/Internal/Admin/RemoteInboxNotifications.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * Remote Inbox Notifications feature.
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;
diff --git a/plugins/woocommerce/src/Internal/Admin/Settings.php b/plugins/woocommerce/src/Internal/Admin/Settings.php
index 668539c40d0..f8a3d306158 100644
--- a/plugins/woocommerce/src/Internal/Admin/Settings.php
+++ b/plugins/woocommerce/src/Internal/Admin/Settings.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Settings.
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;
diff --git a/plugins/woocommerce/src/Internal/Admin/SettingsNavigationFeature.php b/plugins/woocommerce/src/Internal/Admin/SettingsNavigationFeature.php
index e1247ef02b3..49a14b96b28 100644
--- a/plugins/woocommerce/src/Internal/Admin/SettingsNavigationFeature.php
+++ b/plugins/woocommerce/src/Internal/Admin/SettingsNavigationFeature.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Settings.
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;
diff --git a/plugins/woocommerce/src/Internal/Admin/ShippingLabelBanner.php b/plugins/woocommerce/src/Internal/Admin/ShippingLabelBanner.php
index b1dc2d55b6e..3cf64fad97d 100644
--- a/plugins/woocommerce/src/Internal/Admin/ShippingLabelBanner.php
+++ b/plugins/woocommerce/src/Internal/Admin/ShippingLabelBanner.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Shipping Label banner.
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;
diff --git a/plugins/woocommerce/src/Internal/Admin/ShippingLabelBannerDisplayRules.php b/plugins/woocommerce/src/Internal/Admin/ShippingLabelBannerDisplayRules.php
index 57b0b2b25f1..470596b2d5e 100644
--- a/plugins/woocommerce/src/Internal/Admin/ShippingLabelBannerDisplayRules.php
+++ b/plugins/woocommerce/src/Internal/Admin/ShippingLabelBannerDisplayRules.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * WooCommerce Shipping Label Banner Display Rules.
- * NOTE: DO NOT edit this file in WooCommerce core, this is generated from woocommerce-admin.
  */
 
 namespace Automattic\WooCommerce\Internal\Admin;