diff --git a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts
index 839241742f..3391aca0be 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts
@@ -1,12 +1,11 @@
 import { Component } from '@angular/core';
-import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
-import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
+import {
+  ItemMetadataRepresentationListElementComponent
+} from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { RouterLink } from '@angular/router';
 import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component';
 
-@metadataRepresentationComponent('OrgUnit', MetadataRepresentationType.Item)
 @Component({
     selector: 'ds-org-unit-item-metadata-list-element',
     templateUrl: './org-unit-item-metadata-list-element.component.html',
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
index 293bfc9754..9e40d5a0d0 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
@@ -1,13 +1,12 @@
 import { Component } from '@angular/core';
-import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
-import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
+import {
+  ItemMetadataRepresentationListElementComponent
+} from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { RouterLink } from '@angular/router';
 import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component';
-import { NgIf, NgFor } from '@angular/common';
+import { NgFor, NgIf } from '@angular/common';
 
-@metadataRepresentationComponent('Person', MetadataRepresentationType.Item)
 @Component({
     selector: 'ds-person-item-metadata-list-element',
     templateUrl: './person-item-metadata-list-element.component.html',
diff --git a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts
index fd3b9dd217..aa374267a6 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts
@@ -1,13 +1,12 @@
 import { Component } from '@angular/core';
-import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
-import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
+import {
+  ItemMetadataRepresentationListElementComponent
+} from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { RouterLink } from '@angular/router';
 import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component';
 
-@metadataRepresentationComponent('Project', MetadataRepresentationType.Item)
 @Component({
     selector: 'ds-project-item-metadata-list-element',
     templateUrl: './project-item-metadata-list-element.component.html',
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
index 0dc9a14e73..5f60c6aeb3 100644
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
@@ -3,17 +3,17 @@ import {
   ComponentFactoryResolver,
   EventEmitter,
   Input,
+  OnChanges,
   OnInit,
   Output,
-  ViewChild,
-  OnChanges,
   SimpleChanges,
-  ComponentRef,
+  Type,
+  ViewChild,
 } from '@angular/core';
 import { getComponentByWorkflowTaskOption } from './claimed-task-actions-decorator';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { ClaimedTaskActionsDirective } from './claimed-task-actions.directive';
-import { hasValue, isNotEmpty, hasNoValue } from '../../../empty.util';
+import { hasNoValue, hasValue, isNotEmpty } from '../../../empty.util';
 import { MyDSpaceActionsResult } from '../../mydspace-actions';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
@@ -64,7 +64,7 @@ export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges {
   /**
    * The reference to the dynamic component
    */
-  protected compRef: ComponentRef<Component>;
+  protected compRef;
 
   /**
    * The list of input and output names for the dynamic component
@@ -105,7 +105,7 @@ export class ClaimedTaskActionsLoaderComponent implements OnInit, OnChanges {
   }
 
   private instantiateComponent(changes?: SimpleChanges): void {
-    const comp = this.getComponentByWorkflowTaskOption(this.option);
+    const comp = this.getComponentByWorkflowTaskOption(this.option) as Type<unknown>;
     if (hasValue(comp)) {
       const componentFactory = this.componentFactoryResolver.resolveComponentFactory(comp);
 
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
index 582a17523e..f441ea57c7 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
@@ -1,14 +1,9 @@
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { Component } from '@angular/core';
 import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
-import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
 import { VALUE_LIST_BROWSE_DEFINITION } from '../../../../core/shared/value-list-browse-definition.resource-type';
 import { RouterLink } from '@angular/router';
 import { NgIf } from '@angular/common';
-//@metadataRepresentationComponent('Publication', MetadataRepresentationType.PlainText)
-// For now, authority controlled fields are rendered the same way as plain text fields
-//@metadataRepresentationComponent('Publication', MetadataRepresentationType.AuthorityControlled)
-@metadataRepresentationComponent('Publication', MetadataRepresentationType.BrowseLink)
+
 @Component({
     selector: 'ds-browse-link-metadata-list-element',
     templateUrl: './browse-link-metadata-list-element.component.html',
diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts
index d8e54c6b29..55ebe2c2f3 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts
@@ -1,11 +1,10 @@
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { Component } from '@angular/core';
 import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
-import { ListableObjectComponentLoaderComponent } from '../../../object-collection/shared/listable-object/listable-object-component-loader.component';
+import {
+  ListableObjectComponentLoaderComponent
+} from '../../../object-collection/shared/listable-object/listable-object-component-loader.component';
 
-@metadataRepresentationComponent('Publication', MetadataRepresentationType.Item)
 @Component({
     selector: 'ds-item-metadata-list-element',
     templateUrl: './item-metadata-list-element.component.html',
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
index f3240dfe5f..25de2e3403 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
@@ -1,14 +1,9 @@
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { Component } from '@angular/core';
 import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
-import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
 import { VALUE_LIST_BROWSE_DEFINITION } from '../../../../core/shared/value-list-browse-definition.resource-type';
 import { RouterLink } from '@angular/router';
 import { NgIf } from '@angular/common';
 
-@metadataRepresentationComponent('Publication', MetadataRepresentationType.PlainText)
-// For now, authority controlled fields are rendered the same way as plain text fields
-@metadataRepresentationComponent('Publication', MetadataRepresentationType.AuthorityControlled)
 @Component({
     selector: 'ds-plain-text-metadata-list-element',
     templateUrl: './plain-text-metadata-list-element.component.html',