diff --git a/frontend/src/app/core/services/auth/auth.service.ts b/frontend/src/app/core/services/auth/auth.service.ts
index e6458d6dd..b212e57c7 100644
--- a/frontend/src/app/core/services/auth/auth.service.ts
+++ b/frontend/src/app/core/services/auth/auth.service.ts
@@ -350,10 +350,7 @@ export class AuthService extends BaseService {
 
 	onAuthenticateError(errorResponse: HttpErrorResponse) {
 		this.zone.run(() => {
-			// const error: HttpError =
-			// 	this.httpErrorHandlingService.getError(errorResponse);
 			this.uiNotificationService.snackBarNotification(
-				// error.getMessagesString(),
 				errorResponse.message,
 				SnackBarNotificationLevel.Warning
 			);
diff --git a/frontend/src/app/core/services/utilities/query-params.service.ts b/frontend/src/app/core/services/utilities/query-params.service.ts
index 20260db4a..5ce4159ae 100644
--- a/frontend/src/app/core/services/utilities/query-params.service.ts
+++ b/frontend/src/app/core/services/utilities/query-params.service.ts
@@ -11,8 +11,6 @@ export class QueryParamsService {
 	serializeLookup(lookup: Lookup): string {
 		return JSON.stringify(lookup, (key: string, value: any) => {
 			switch (key) {
-				// 	case nameof<Lookup>(x => x.page):
-				// 	case nameof<Lookup>(x => x.order):
 				case nameof<Lookup>(x => x.metadata):
 				case nameof<Lookup>(x => x.project):
 					return undefined;
@@ -24,8 +22,6 @@ export class QueryParamsService {
 
 	deSerializeLookup(serializedLookup: string): any {
 		const json = JSON.parse(serializedLookup);
-		// delete json[nameof<Lookup>(x => x.page)];
-		// delete json[nameof<Lookup>(x => x.order)];
 		delete json[nameof<Lookup>(x => x.metadata)];
 		delete json[nameof<Lookup>(x => x.project)];
 		return json;
diff --git a/frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts b/frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts
index 0ce1b82a4..ae91dc69b 100644
--- a/frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts
+++ b/frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts
@@ -67,8 +67,6 @@ export class MultipleAutoCompleteComponent extends _CustomComponentMixinBase imp
 
 	valueOnBlur = new BehaviorSubject<any>(null);
 	onSelectAutoCompleteValue = new BehaviorSubject<any>(null);
-	// valueAssignSubscription: Subscription;
-
 	queryValue: string = "";
 
 	focused = false;
@@ -406,16 +404,9 @@ export class MultipleAutoCompleteComponent extends _CustomComponentMixinBase imp
 	//Chip Functions
 	_addItem(event: MatChipInputEvent): void {
 		const input = event.input;
-		const value = event.value;
-		// Add our fruit
-		// if ((value || '').trim()) {
-		// 	this.selectedItems.push(value.trim());
-		// }
-		// Reset the input value
 		if (input) {
 			this.inputValue = '';
 		}
-		//this.inputFormControl.setValue(null);
 	}
 	public reset(): void {
 		this._inputSubject.unsubscribe();
diff --git a/frontend/src/app/library/guided-tour/guided-tour.component.ts b/frontend/src/app/library/guided-tour/guided-tour.component.ts
index 651975b98..eb094e184 100644
--- a/frontend/src/app/library/guided-tour/guided-tour.component.ts
+++ b/frontend/src/app/library/guided-tour/guided-tour.component.ts
@@ -337,8 +337,6 @@ export class GuidedTourComponent implements AfterViewInit, OnDestroy {
 
     public get overlayTop(): number {
         if (this.selectedElementRect) {
-            // return this.selectedElementRect.top - this.getHighlightPadding();
-
             /*custom add*/
             let customTopOffset = 0;
             if (this.currentTourStep.customTopOffset) {
diff --git a/frontend/src/app/library/rich-text-editor/rich-text-editor.component.ts b/frontend/src/app/library/rich-text-editor/rich-text-editor.component.ts
index b9c73c95f..ea37ca853 100644
--- a/frontend/src/app/library/rich-text-editor/rich-text-editor.component.ts
+++ b/frontend/src/app/library/rich-text-editor/rich-text-editor.component.ts
@@ -12,10 +12,6 @@ import { Subscription } from "rxjs";
 							placeholder="{{(placeholder? (placeholder | translate) : '') + (required ? ' *': '')}}"
 							(paste)="pasteWithoutFormatting($event)"></angular-editor>
 			<mat-icon *ngIf="form.value && editable" (click)="parentFormGroup.get(controlName).patchValue('')" class="clear">close</mat-icon>
-			<!-- <mat-form-field class="full-width editor">
-      			<mat-label>{{(placeholder? (placeholder | translate) : '')}}</mat-label>
-	  			<textarea matInput [formControl]="form" rows="5"></textarea>
-   		 	</mat-form-field> -->
 		</div>
 	`,
 	styleUrls: ['./rich-text-editor.component.scss'],
@@ -68,10 +64,8 @@ export class RichTextEditorComponent implements OnInit, OnChanges, OnDestroy {
 			[
 				'fontSize',
 				'backgroundColor',
-				// 'customClasses',
 				'insertImage',
 				'insertVideo',
-				// 'removeFormat',
 				'toggleEditorMode'
 			],
 			[
diff --git a/frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.ts b/frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.ts
index b27793b86..3530d7c6a 100644
--- a/frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.ts
+++ b/frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.ts
@@ -212,10 +212,6 @@ export class DescriptionTemplateEditorFieldComponent extends BaseComponent imple
 
 		}
 		this.clearVisibilityRulesValue();
-
-		// setTimeout(() => { //TODO
-		// 	this.showPreview = true;
-		// });
 	}
 
 
diff --git a/frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts b/frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
index b6181aa88..436312088 100644
--- a/frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
+++ b/frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
@@ -382,8 +382,6 @@ export class DescriptionTemplateEditorComponent extends BaseEditor<DescriptionTe
 
 		if (event.selectedIndex === (this.steps.length - 1)) {//preview selected
 			this.generatePreviewForm();
-		} else {
-			// this.formGroup = null;
 		}
 		this.formGroup.markAsUntouched();
 
diff --git a/frontend/src/app/ui/description/editor/table-of-contents/models/toc-entry.ts b/frontend/src/app/ui/description/editor/table-of-contents/models/toc-entry.ts
index 8fe8adb48..86b69761f 100644
--- a/frontend/src/app/ui/description/editor/table-of-contents/models/toc-entry.ts
+++ b/frontend/src/app/ui/description/editor/table-of-contents/models/toc-entry.ts
@@ -7,7 +7,6 @@ export interface ToCEntry {
 	subEntriesType: ToCEntryType;
 	subEntries: ToCEntry[];
 	type: ToCEntryType;
-	// form: AbstractControl;
 	numbering: string;
 	ordinal: number;
 	hidden?: boolean;
diff --git a/frontend/src/app/ui/description/editor/table-of-contents/table-of-contents.component.ts b/frontend/src/app/ui/description/editor/table-of-contents/table-of-contents.component.ts
index 83c0bb3b9..b5be59ceb 100644
--- a/frontend/src/app/ui/description/editor/table-of-contents/table-of-contents.component.ts
+++ b/frontend/src/app/ui/description/editor/table-of-contents/table-of-contents.component.ts
@@ -222,7 +222,6 @@ export class TableOfContentsComponent extends BaseComponent implements OnInit, O
 			});
 		}
 		return {
-			// form: form,
 			id: item.id,
 			label: item.title,
 			numbering: '',
@@ -239,7 +238,6 @@ export class TableOfContentsComponent extends BaseComponent implements OnInit, O
 		if (!item) return null;
 
 		return {
-			// form: form,
 			id: item.id,
 			label: item.title,
 			numbering: 's',
diff --git a/frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.ts b/frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.ts
index 23d72ef42..3996e781c 100644
--- a/frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.ts
+++ b/frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.ts
@@ -85,11 +85,9 @@ export class DescriptionListingItemComponent extends BaseComponent implements On
 		} else if (this.description.status === DescriptionStatus.Draft) {
 			this.isDraft = true;
 			this.isDeleted = false;
-			this.setIsUserOwner();
 		} else {
 			this.isDraft = false;
 			this.isDeleted = false;
-			this.setIsUserOwner();
 		}
 
 		this.canDelete = (this.authService.hasPermission(AppPermission.DeleteDescription) ||
@@ -106,14 +104,6 @@ export class DescriptionListingItemComponent extends BaseComponent implements On
 		return this.tenants?.find(t => t?.id == id)?.name;
 	}
 
-	setIsUserOwner() {
-		if (this.description) {
-			const principalId: string = this.authService.userId()?.toString();
-			//TODO: add user to description objects
-			//if (principalId) this.isUserOwner = !!this.description.users.find(x => (x.role === Role.Owner) && (principalId === x.id));
-		}
-	}
-
 	isUserPlanRelated() {
 		const principalId: Guid = this.authService.userId();
 		return this.description.plan.planUsers?.some(x => (x.user.id === principalId));
diff --git a/frontend/src/app/ui/plan/listing/plan-listing.component.ts b/frontend/src/app/ui/plan/listing/plan-listing.component.ts
index f4e63082a..124f75ec3 100644
--- a/frontend/src/app/ui/plan/listing/plan-listing.component.ts
+++ b/frontend/src/app/ui/plan/listing/plan-listing.component.ts
@@ -273,10 +273,6 @@ export class PlanListingComponent extends BaseListingComponent<BasePlan, PlanLoo
 		this.filterChanged(this.lookup, true);
 	}
 
-	openShareDialog(rowId: any, rowName: any) {
-		//TODO: add this
-	}
-
 	openFiltersDialog(): void {
 		let dialogRef = this.dialog.open(PlanFilterDialogComponent, {
 			width: '456px',
diff --git a/frontend/src/app/ui/plan/overview/plan-overview.component.ts b/frontend/src/app/ui/plan/overview/plan-overview.component.ts
index 76dec15a4..ce9a10200 100644
--- a/frontend/src/app/ui/plan/overview/plan-overview.component.ts
+++ b/frontend/src/app/ui/plan/overview/plan-overview.component.ts
@@ -441,8 +441,6 @@ export class PlanOverviewComponent extends BaseComponent implements OnInit {
 
 	openShareDialog(rowId: any, rowName: any) {
 		const dialogRef = this.dialog.open(PlanInvitationDialogComponent, {
-			// height: '250px',
-			// width: '700px',
 			autoFocus: false,
 			restoreFocus: false,
 			data: {
diff --git a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts
index 5dc8ef427..205a1f9f8 100644
--- a/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts
+++ b/frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts
@@ -780,7 +780,7 @@ export class PlanEditorComponent extends BaseEditor<PlanEditorModel, Plan> imple
 	//
 	//
 	public isDirty(): boolean {
-		return this.formGroup && this.formGroup.dirty; //&& this.hasChanges;
+		return this.formGroup && this.formGroup.dirty;
 	}
 
 	getLanguageInfos(): LanguageInfo[] {