diff --git a/src/app/components/creator/_dialogs/room-create/room-create.component.ts b/src/app/components/creator/_dialogs/room-create/room-create.component.ts
index 0deb11e1311c7c4c04ded77aa41b576796032d2a..a75f85879d108e9a5a42a87ca0f1728c251fdad1 100644
--- a/src/app/components/creator/_dialogs/room-create/room-create.component.ts
+++ b/src/app/components/creator/_dialogs/room-create/room-create.component.ts
@@ -4,7 +4,7 @@ import { Room } from '../../../../models/room';
 import { Router } from '@angular/router';
 import { NotificationService } from '../../../../services/util/notification.service';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
-import { ContentService} from "../../../../services/http/content.service";
+import { ContentService } from '../../../../services/http/content.service';
 
 @Component({
   selector: 'app-room-create',
diff --git a/src/app/components/creator/_dialogs/room-delete/room-delete.component.html b/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
index bd3e54708652c01c7b77fe1d43ab65fd145cde45..5d1b26d2f7f805105df429c8552209f15bc4c05a 100644
--- a/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
+++ b/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
@@ -1,3 +1,4 @@
+<!-- TODO: Use TranslateService -->
 <h3>Are you sure?</h3>
 <p>Do you really want to delete room <strong>{{room.name}}</strong>? This action can not be undone.</p>
 <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.html b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
index b50e0acdcbe20bc0a9cc97baf3ff9d7b25624ffe..d4eb905d3dd03e967d52d703ff9b6aa2fea55e61 100644
--- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
+++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
@@ -1,3 +1,4 @@
+<!-- TODO Use TranslateService -->
 <div *ngIf="editRoom">
   <mat-form-field class="input-block">
     <input [(ngModel)]="editRoom.name" #roomName matInput placeholder="Room name" name="room-name"/>
diff --git a/src/app/components/creator/creator-content-carousel-page/creator-content-carousel-page.component.ts b/src/app/components/creator/creator-content-carousel-page/creator-content-carousel-page.component.ts
index 572577733996c65afdd4a65c4ef66c27bcfa6354..0a6101984c88cfdf3b437881b4c349a8652b96a3 100644
--- a/src/app/components/creator/creator-content-carousel-page/creator-content-carousel-page.component.ts
+++ b/src/app/components/creator/creator-content-carousel-page/creator-content-carousel-page.component.ts
@@ -1,8 +1,5 @@
 import { Component, OnInit } from '@angular/core';
 import { ContentType } from '../../../models/content-type.enum';
-import { AnswerOption } from '../../../models/answer-option';
-import { ContentChoice } from '../../../models/content-choice';
-import { ContentText } from '../../../models/content-text';
 import { ContentService } from '../../../services/http/content.service';
 import { ActivatedRoute } from '@angular/router';
 import { Content } from '../../../models/content';
diff --git a/src/app/components/login-page/login-page.component.ts b/src/app/components/login-page/login-page.component.ts
index 6eb97685d04e8950601527a9b2d9b213c34ca686..c6b788cbdcd2433c107fab48573b6bcff786f880 100644
--- a/src/app/components/login-page/login-page.component.ts
+++ b/src/app/components/login-page/login-page.component.ts
@@ -10,7 +10,6 @@ import { UserRole } from '../../models/user-roles.enum';
   styleUrls: ['./login-page.component.scss']
 })
 export class LoginPageComponent implements OnInit {
-  // Make UserRole available to the template
   UserRole = UserRole;
   username: string;
   password: string;
diff --git a/src/app/components/participant/content-choice-participant/content-choice-participant.component.ts b/src/app/components/participant/content-choice-participant/content-choice-participant.component.ts
index 344593533289ec9047108b97c11b7164337d80fc..8675b7e67853d9ebb6b37547acfbbc953d12a66a 100644
--- a/src/app/components/participant/content-choice-participant/content-choice-participant.component.ts
+++ b/src/app/components/participant/content-choice-participant/content-choice-participant.component.ts
@@ -27,24 +27,6 @@ export class ContentChoiceParticipantComponent implements OnInit {
 
   selectedSingleAnswer: string;
 
-  dummyContent: ContentChoice = new ContentChoice(
-    '2',
-    '1',
-    '1',
-    'Choice Content 1',
-    'This is the body of Choice Content 1',
-    1,
-    [],
-    [
-      new AnswerOption('Option 1', '0'),
-      new AnswerOption('Option 2', '10'),
-      new AnswerOption('Option 3', '20'),
-      new AnswerOption('Option 4', '30')
-    ],
-    [2, 3, 4],
-    false,
-    ContentType.BINARY
-  );
   checkedAnswers: CheckedAnswer[] = [];
   isAnswerSent = false;
 
diff --git a/src/app/components/participant/room-participant-page/room-participant-page.component.ts b/src/app/components/participant/room-participant-page/room-participant-page.component.ts
index 03f9b324d780ef42338e4d15f8dbcfc58d3c4dbd..dcbf261dd18066243f6b745d1b7e8edf40188968 100644
--- a/src/app/components/participant/room-participant-page/room-participant-page.component.ts
+++ b/src/app/components/participant/room-participant-page/room-participant-page.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Room } from '../../../models/room';
 import { Location } from '@angular/common';
 import { RoomService } from '../../../services/http/room.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { LanguageService } from '../../shared/LanguageService';