diff --git a/packages/block-editor/src/hooks/variation.js b/packages/block-editor/src/hooks/variation.js
index 8ea7fecf79c28d..7642ae8b43c8ef 100644
--- a/packages/block-editor/src/hooks/variation.js
+++ b/packages/block-editor/src/hooks/variation.js
@@ -17,7 +17,7 @@ import { useStyleOverride } from './utils';
 import { store as blockEditorStore } from '../store';
 
 export default {
-	hasSupport: () => true, // TODO: Work out what the eligibility here should be.
+	hasSupport: () => true,
 	attributeKeys: [ 'style' ],
 	passChildren: true,
 	useBlockProps,
diff --git a/packages/edit-site/src/components/global-styles/global-styles-provider.js b/packages/edit-site/src/components/global-styles/global-styles-provider.js
index 2b8263cff63f50..91300780b26043 100644
--- a/packages/edit-site/src/components/global-styles/global-styles-provider.js
+++ b/packages/edit-site/src/components/global-styles/global-styles-provider.js
@@ -16,7 +16,6 @@ import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
  * Internal dependencies
  */
 import { unlock } from '../../lock-unlock';
-//TODO: If this these updates actually stick around. Move this to utils.
 import { setNestedValue } from '../../hooks/push-changes-to-global-styles';
 
 const { GlobalStylesContext, cleanEmptyObject } = unlock(
@@ -156,10 +155,6 @@ function useGlobalStylesContext() {
 		useGlobalStylesUserConfig();
 	const [ isBaseConfigReady, baseConfig ] = useGlobalStylesBaseConfig();
 
-	// TODO: Where is the right place to resolve shared block style
-	// variations within the site editor when they are in a theme
-	// style variation's data that simply gets applied to the "user"
-	// origin styles?
 	const userConfigWithVariations = useMemo( () => {
 		if ( ! userConfig ) {
 			return userConfig;