diff --git a/frontend/src/app/core/model/plan/plan.ts b/frontend/src/app/core/model/plan/plan.ts
index 49e126cc0..efc5c811b 100644
--- a/frontend/src/app/core/model/plan/plan.ts
+++ b/frontend/src/app/core/model/plan/plan.ts
@@ -66,8 +66,8 @@ export interface PlanUser extends BaseEntity {
 
 export interface PlanDescriptionTemplate extends BaseEntity {
 	plan?: Plan;
-	currentDescriptionTemplate?: DescriptionTemplate; //TODO: what is this?
-	descriptionTemplates?: DescriptionTemplate[]; //TODO: why it is array?
+	currentDescriptionTemplate?: DescriptionTemplate;
+	descriptionTemplates?: DescriptionTemplate[];
 	descriptionTemplateGroupId?: Guid;
 	sectionId?: Guid;
 }
diff --git a/frontend/src/app/ui/admin/description-template/editor/components/default-value/description-template-editor-default-value.component.html b/frontend/src/app/ui/admin/description-template/editor/components/default-value/description-template-editor-default-value.component.html
index 11c9ff54b..9ba23a1f5 100644
--- a/frontend/src/app/ui/admin/description-template/editor/components/default-value/description-template-editor-default-value.component.html
+++ b/frontend/src/app/ui/admin/description-template/editor/components/default-value/description-template-editor-default-value.component.html
@@ -75,7 +75,6 @@
 
 	<!-- DatePicker -->
 	<mat-form-field class="col-12" *ngIf="fieldType === descriptionTemplateFieldTypeEnum.DATE_PICKER">
-		<!--(focus)="date.open()" (click)="date.open()"-->
 		<mat-label>{{placeHolder}}</mat-label>
 		<input matInput [placeholder]="placeHolder" class="table-input" [matDatepicker]="date" [formControl]="form" [required]="required">
 		<mat-datepicker-toggle matSuffix [for]="date"></mat-datepicker-toggle>
diff --git a/frontend/src/app/ui/admin/description-template/editor/components/field-type/label-and-multiplicity-field/description-template-editor-label-and-multiplicity-field.component.html b/frontend/src/app/ui/admin/description-template/editor/components/field-type/label-and-multiplicity-field/description-template-editor-label-and-multiplicity-field.component.html
index 505f3850b..3693c6132 100644
--- a/frontend/src/app/ui/admin/description-template/editor/components/field-type/label-and-multiplicity-field/description-template-editor-label-and-multiplicity-field.component.html
+++ b/frontend/src/app/ui/admin/description-template/editor/components/field-type/label-and-multiplicity-field/description-template-editor-label-and-multiplicity-field.component.html
@@ -1,5 +1,4 @@
 <div class="row" *ngIf="form.get('data')">
-	<!-- <h5 style="font-weight: bold" class="col-12">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-LICENSES-TITLE' | translate}}</h5> -->
 	<mat-checkbox class="col-auto" [formControl]="this.form.get('data').get('multipleSelect')">
 		{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-MULTIPLE-AUTOCOMPLETE' | translate}}
 	</mat-checkbox>
diff --git a/frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html b/frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html
index 8e3f2e5f3..fe5909e3d 100644
--- a/frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html
+++ b/frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html
@@ -46,7 +46,6 @@
 					</mat-option>
 					<mat-divider></mat-divider>
 					<mat-option [value]="descriptionTemplateFieldTypeEnum.UPLOAD">
-						<!--					<img src="/assets/images/editor/icons/text_area.svg" class="input_icon" alt="Upload icon">-->
 						<mat-icon class="input_icon" style="font-size: 14px; color: #129d99; display: inline-flex; align-items: center">upload</mat-icon>
 						{{enumUtils.toDescriptionTemplateFieldTypeString(descriptionTemplateFieldTypeEnum.UPLOAD)}}
 					</mat-option>
diff --git a/frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html b/frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
index 096e3e881..bc0abcb5d 100644
--- a/frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
+++ b/frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
@@ -32,9 +32,6 @@
 
 	<mat-horizontal-stepper [linear]="!isFinalized" #stepper class="stepper" (selectionChange)="onMatStepperSelectionChange($event)" style="padding-left: 8px; padding-right: 15px;">
 
-		<!-- IMPORTANT TO BE !INVALID (WHEN THE TEMPLATE IS FINALIZED THE CONTORLS ARE DISABLED) -->
-			<!-- <ng-template matStepLabel>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.TITLE' | translate}}
-				</ng-template> -->
 		<mat-step [label]="generalInfoStepperLabel" [completed]="(!formGroup.get('label').invalid && !formGroup.get('description').invalid && !formGroup.get('language').invalid)">
 			<div class="col-9">
 				<div class="col">
diff --git a/frontend/src/index.html b/frontend/src/index.html
index 50b68e228..01bec80b2 100644
--- a/frontend/src/index.html
+++ b/frontend/src/index.html
@@ -7,10 +7,8 @@
 	<meta charset="utf-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<!-- <title>Data Management Plans Creator</title> -->
 	<base href="/">
 	<meta name="csrf-token" content="2c64def7de30197c40276fe1a7ea874ca8871f70be7d7dc3305465a4d5c565e4">
-	<!-- <meta name="viewport" content="width=device-width, initial-scale=1"> -->
 	<link rel="icon" type="image/x-icon" href="favicon.ico">
 	<script src="//connect.facebook.net/en_US/all.js"></script>
 	<script type="text/javascript" src="//platform.linkedin.com/in.js"></script>