diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
index 06aa818ba806b9e31e753813169f82e597594369..3019b238d557c8fdedab3bfc3cba4e97c9d2f0ef 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
+++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
@@ -199,14 +199,6 @@
   </mat-card>
 
   <mat-accordion>
-    <!-- <mat-expansion-panel class="color-surface" hideToggle *ngIf="keywords.length === 0 || (searchMode && filteredKeywords.length === 0)">
-      <mat-expansion-panel-header class="color-surface">
-        <mat-panel-title fxLayoutAlign="center">
-          {{'topic-cloud-dialog.no-keywords-note' | translate}}
-        </mat-panel-title>
-      </mat-expansion-panel-header>
-    </mat-expansion-panel> -->
-
     <mat-expansion-panel class="color-surface" (opened)="panelOpenState = true" (closed)="panelOpenState = edit = false"
       *ngFor="let keyword of
                         (searchMode ? filteredKeywords : keywords); let i = index" [attr.data-index]="i">
diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
index c64d052484e5763bb1de96739328eb769efd2d01..4470e6dd948d5f3ad3cf3f8a608e4c4d6a4ac5fc 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
+++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
@@ -43,9 +43,6 @@ export class TopicCloudAdministrationComponent implements OnInit, OnDestroy {
   showSettingsPanel = false;
   keywordORfulltext: string = undefined;
   userRole: UserRole;
-
-  @ViewChild('allSelectedDE') allSelectedDE2;
-  // @ViewChild('allSelectedEN') allSelectedEN;
   allSelectedDE = true;
   allSelectedEN = true;
   spacyLabels: Labels;
@@ -112,7 +109,6 @@ export class TopicCloudAdministrationComponent implements OnInit, OnDestroy {
           }
         });
       });
-      // this.checkIfThereAreQuestions();
       this.sortQuestions();
     });
   }