diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/workspace-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/workspace-modal.token.ts
index c9b2f63681..27b52e61bf 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/workspace-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/workspace-modal.token.ts
@@ -5,7 +5,6 @@ export interface UmbWorkspaceModalData<DataModelType = unknown> {
 	baseDataPath?: string;
 }
 
-// TODO: It would be good with a WorkspaceValueBaseType, to avoid the  hardcoded type for unique here:
 export type UmbWorkspaceModalValue =
 	| {
 			unique: string;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/views/settings/property-workspace-view-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/views/settings/property-workspace-view-settings.element.ts
index 2315c179fc..182c6ed329 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/views/settings/property-workspace-view-settings.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-type/workspace/views/settings/property-workspace-view-settings.element.ts
@@ -181,7 +181,6 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
 		return html`
 			<uui-box class="uui-text">
 				<div class="container">
-					<!-- TODO: Align styling across this and the property of document type workspace editor, or consider if this can go away for a different UX flow -->
 					<uui-form-validation-message>
 						<uui-input
 							id="name-input"
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validator.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validator.context.ts
index 98aa46550e..410483e6d4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validator.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/validation/controllers/server-model-validator.context.ts
@@ -92,7 +92,6 @@ export class UmbServerModelValidatorContext
 							culture: variant.culture,
 							segment: variant.segment,
 						})}].value`;
-						// TODO: Make a const that holds this translation-key:
 						this.#context!.messages.addMessages('server', path, [UMB_VALIDATION_EMPTY_LOCALIZATION_KEY]);
 					});
 				});
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/submittable-workspace-context-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/submittable-workspace-context-base.ts
index f2429a9518..ccc13c9526 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/submittable-workspace-context-base.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/contexts/submittable-workspace-context-base.ts
@@ -109,6 +109,8 @@ export abstract class UmbSubmittableWorkspaceContextBase<WorkspaceDataModelType>
 
 	#rejectSubmit = () => {
 		if (this.#submitPromise) {
+			// TODO: Capture the validation contexts messages on open, and then reset to them in this case. [NL]
+
 			this.#submitReject?.();
 			this.#submitPromise = undefined;
 			this.#submitResolve = undefined;
@@ -134,7 +136,7 @@ export abstract class UmbSubmittableWorkspaceContextBase<WorkspaceDataModelType>
 		this.#resolveSubmit();
 
 		// Calling reset on the validation context here. [NL]
-		// TODO: Consider if we really ant this, cause on save, we do not want to reset this... [NL] (Also adapt to concept of multiple validation contexts)
+		// TODO: Capture the validation messages on open, and then reset to that.
 		//this.validation.reset();
 	};