diff --git a/src/app/access-control/access-control.module.ts b/src/app/access-control/access-control.module.ts
index 9bf3e29070..3c18219571 100644
--- a/src/app/access-control/access-control.module.ts
+++ b/src/app/access-control/access-control.module.ts
@@ -15,7 +15,6 @@ import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 import { BulkAccessBrowseComponent } from './bulk-access/browse/bulk-access-browse.component';
 import { BulkAccessSettingsComponent } from './bulk-access/settings/bulk-access-settings.component';
 import { SearchModule } from '../shared/search/search.module';
-import { AccessControlFormModule } from '../shared/access-control-form-container/access-control-form.module';
 
 /**
  * Condition for displaying error messages on email form field
@@ -32,7 +31,6 @@ export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
         FormModule,
         NgbAccordionModule,
         SearchModule,
-        AccessControlFormModule,
         EPeopleRegistryComponent,
         EPersonFormComponent,
         GroupsRegistryComponent,
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
index 4dda69810e..1bbf320ad5 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
@@ -40,6 +40,7 @@ export const BROWSE_BY_DECORATOR_MAP =
  * Decorator used for rendering Browse-By pages by type
  * @param browseByType  The type of page
  * @param theme The optional theme for the component
+ * @deprecated
  */
 export function rendersBrowseBy(browseByType: BrowseByDataType, theme = DEFAULT_THEME) {
   return function decorator(component: any) {
diff --git a/src/app/collection-page/collection-page.module.ts b/src/app/collection-page/collection-page.module.ts
index 15f5f88e84..0c28e208de 100644
--- a/src/app/collection-page/collection-page.module.ts
+++ b/src/app/collection-page/collection-page.module.ts
@@ -16,26 +16,24 @@ import { StatisticsModule } from '../statistics/statistics.module';
 import { CollectionFormModule } from './collection-form/collection-form.module';
 import { ThemedCollectionPageComponent } from './themed-collection-page.component';
 import { ComcolModule } from '../shared/comcol/comcol.module';
-import { DsoSharedModule } from '../dso-shared/dso-shared.module';
 import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 
 @NgModule({
     imports: [
-        CommonModule,
-        StatisticsModule.forRoot(),
-        EditItemPageModule,
-        CollectionFormModule,
-        ComcolModule,
-        DsoSharedModule,
-        DsoPageModule,
-        CollectionPageComponent,
-        ThemedCollectionPageComponent,
-        CreateCollectionPageComponent,
-        DeleteCollectionPageComponent,
-        EditItemTemplatePageComponent,
-        ThemedEditItemTemplatePageComponent,
-        CollectionItemMapperComponent
-    ],
+    CommonModule,
+    StatisticsModule.forRoot(),
+    EditItemPageModule,
+    CollectionFormModule,
+    ComcolModule,
+    DsoPageModule,
+    CollectionPageComponent,
+    ThemedCollectionPageComponent,
+    CreateCollectionPageComponent,
+    DeleteCollectionPageComponent,
+    EditItemTemplatePageComponent,
+    ThemedEditItemTemplatePageComponent,
+    CollectionItemMapperComponent
+],
     providers: [
         SearchService,
     ]
diff --git a/src/app/dso-shared/dso-shared.module.ts b/src/app/dso-shared/dso-shared.module.ts
deleted file mode 100644
index 937ecc167f..0000000000
--- a/src/app/dso-shared/dso-shared.module.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { NgModule } from '@angular/core';
-import { DsoEditMetadataComponent } from './dso-edit-metadata/dso-edit-metadata.component';
-import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
-import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component';
-import { DsoEditMetadataValueComponent } from './dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component';
-import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component';
-import { DsoEditMetadataValueHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component';
-import { ThemedDsoEditMetadataComponent } from './dso-edit-metadata/themed-dso-edit-metadata.component';
-
-@NgModule({
-    imports: [
-        DsoEditMetadataComponent,
-        ThemedDsoEditMetadataComponent,
-        MetadataFieldSelectorComponent,
-        DsoEditMetadataFieldValuesComponent,
-        DsoEditMetadataValueComponent,
-        DsoEditMetadataHeadersComponent,
-        DsoEditMetadataValueHeadersComponent
-    ],
-    exports: [
-        DsoEditMetadataComponent,
-        ThemedDsoEditMetadataComponent,
-        MetadataFieldSelectorComponent,
-        DsoEditMetadataFieldValuesComponent,
-        DsoEditMetadataValueComponent,
-        DsoEditMetadataHeadersComponent,
-        DsoEditMetadataValueHeadersComponent,
-    ]
-})
-export class DsoSharedModule {
-
-}
diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts
index 1da2366776..2c8a946304 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { NgbTooltipModule, NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { EditItemPageComponent } from './edit-item-page.component';
 import { ItemStatusComponent } from './item-status/item-status.component';
@@ -18,14 +18,22 @@ import { SearchPageModule } from '../../search-page/search-page.module';
 import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
 import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
 import { EditRelationshipComponent } from './item-relationships/edit-relationship/edit-relationship.component';
-import { EditRelationshipListComponent } from './item-relationships/edit-relationship-list/edit-relationship-list.component';
+import {
+  EditRelationshipListComponent
+} from './item-relationships/edit-relationship-list/edit-relationship-list.component';
 import { AbstractItemUpdateComponent } from './abstract-item-update/abstract-item-update.component';
 import { ItemMoveComponent } from './item-move/item-move.component';
-import { ItemEditBitstreamBundleComponent } from './item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component';
+import {
+  ItemEditBitstreamBundleComponent
+} from './item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component';
 import { BundleDataService } from '../../core/data/bundle-data.service';
 import { DragDropModule } from '@angular/cdk/drag-drop';
-import { ItemEditBitstreamDragHandleComponent } from './item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component';
-import { PaginatedDragAndDropBitstreamListComponent } from './item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component';
+import {
+  ItemEditBitstreamDragHandleComponent
+} from './item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component';
+import {
+  PaginatedDragAndDropBitstreamListComponent
+} from './item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component';
 import { VirtualMetadataComponent } from './virtual-metadata/virtual-metadata.component';
 import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
 import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
@@ -35,60 +43,52 @@ import { ItemVersionsModule } from '../versions/item-versions.module';
 import { IdentifierDataService } from '../../core/data/identifier-data.service';
 import { IdentifierDataComponent } from '../../shared/object-list/identifier-data/identifier-data.component';
 import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component';
-import { DsoSharedModule } from '../../dso-shared/dso-shared.module';
 import { ItemCurateComponent } from './item-curate/item-curate.component';
 import { ThemedItemStatusComponent } from './item-status/themed-item-status.component';
 
 import { ItemAccessControlComponent } from './item-access-control/item-access-control.component';
-import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
-import {
-  AccessControlFormModule
-} from '../../shared/access-control-form-container/access-control-form.module';
 
 /**
  * Module that contains all components related to the Edit Item page administrator functionality
  */
 @NgModule({
     imports: [
-        CommonModule,
-        NgbTooltipModule,
-        SearchPageModule,
-        DragDropModule,
-        ResourcePoliciesModule,
-        NgbModule,
-        ItemVersionsModule,
-        DsoSharedModule,
-        ResultsBackButtonModule,
-        AccessControlFormModule,
-        EditItemPageComponent,
-        ItemOperationComponent,
-        AbstractSimpleItemActionComponent,
-        AbstractItemUpdateComponent,
-        ItemWithdrawComponent,
-        ItemReinstateComponent,
-        ItemPrivateComponent,
-        ItemPublicComponent,
-        ItemDeleteComponent,
-        ItemStatusComponent,
-        ThemedItemStatusComponent,
-        ItemRelationshipsComponent,
-        ItemBitstreamsComponent,
-        ItemVersionHistoryComponent,
-        ItemEditBitstreamComponent,
-        ItemEditBitstreamBundleComponent,
-        PaginatedDragAndDropBitstreamListComponent,
-        EditRelationshipComponent,
-        EditRelationshipListComponent,
-        ItemCollectionMapperComponent,
-        ItemMoveComponent,
-        ItemEditBitstreamDragHandleComponent,
-        VirtualMetadataComponent,
-        ItemAuthorizationsComponent,
-        IdentifierDataComponent,
-        ItemRegisterDoiComponent,
-        ItemCurateComponent,
-        ItemAccessControlComponent
-    ],
+    CommonModule,
+    NgbTooltipModule,
+    SearchPageModule,
+    DragDropModule,
+    ResourcePoliciesModule,
+    NgbModule,
+    ItemVersionsModule,
+    EditItemPageComponent,
+    ItemOperationComponent,
+    AbstractSimpleItemActionComponent,
+    AbstractItemUpdateComponent,
+    ItemWithdrawComponent,
+    ItemReinstateComponent,
+    ItemPrivateComponent,
+    ItemPublicComponent,
+    ItemDeleteComponent,
+    ItemStatusComponent,
+    ThemedItemStatusComponent,
+    ItemRelationshipsComponent,
+    ItemBitstreamsComponent,
+    ItemVersionHistoryComponent,
+    ItemEditBitstreamComponent,
+    ItemEditBitstreamBundleComponent,
+    PaginatedDragAndDropBitstreamListComponent,
+    EditRelationshipComponent,
+    EditRelationshipListComponent,
+    ItemCollectionMapperComponent,
+    ItemMoveComponent,
+    ItemEditBitstreamDragHandleComponent,
+    VirtualMetadataComponent,
+    ItemAuthorizationsComponent,
+    IdentifierDataComponent,
+    ItemRegisterDoiComponent,
+    ItemCurateComponent,
+    ItemAccessControlComponent
+],
     providers: [
         BundleDataService,
         IdentifierDataService,
diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
index 968fc1a281..df17c7046f 100644
--- a/src/app/item-page/item-page.module.ts
+++ b/src/app/item-page/item-page.module.ts
@@ -43,7 +43,6 @@ import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 import { OrcidSyncSettingsComponent } from './orcid-page/orcid-sync-settings/orcid-sync-settings.component';
 import { OrcidQueueComponent } from './orcid-page/orcid-queue/orcid-queue.component';
 import { UploadModule } from '../shared/upload/upload.module';
-import { ResultsBackButtonModule } from '../shared/results-back-button/results-back-button.module';
 import { ItemAlertsComponent } from './alerts/item-alerts.component';
 import { ItemVersionsModule } from './versions/item-versions.module';
 import {
@@ -96,18 +95,17 @@ const DECLARATIONS = [
 
 @NgModule({
     imports: [
-        CommonModule,
-        EditItemPageModule,
-        ItemVersionsModule,
-        ItemSharedModule,
-        StatisticsModule.forRoot(),
-        NgxGalleryModule,
-        NgbAccordionModule,
-        ResultsBackButtonModule,
-        UploadModule,
-        DsoPageModule,
-        ...DECLARATIONS
-    ],
+    CommonModule,
+    EditItemPageModule,
+    ItemVersionsModule,
+    ItemSharedModule,
+    StatisticsModule.forRoot(),
+    NgxGalleryModule,
+    NgbAccordionModule,
+    UploadModule,
+    DsoPageModule,
+    ...DECLARATIONS
+],
     exports: [
         ...DECLARATIONS,
     ]
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
index 3104f620e9..9fe90f2a2e 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
@@ -1,22 +1,21 @@
-import {ComponentFixture, fakeAsync, TestBed} from '@angular/core/testing';
-import {NgbDatepickerModule, NgbModal, NgbModalRef} from '@ng-bootstrap/ng-bootstrap';
-import {Component} from '@angular/core';
-import {of} from 'rxjs';
-import {AccessControlFormContainerComponent} from './access-control-form-container.component';
-import {BulkAccessControlService} from './bulk-access-control.service';
-import {BulkAccessConfigDataService} from '../../core/config/bulk-access-config-data.service';
-import {Item} from '../../core/shared/item.model';
-import {SelectableListService} from '../object-list/selectable-list/selectable-list.service';
-import {createAccessControlInitialFormState} from './access-control-form-container-intial-state';
-import {CommonModule} from '@angular/common';
-import {SharedBrowseByModule} from '../browse-by/shared-browse-by.module';
-import {TranslateModule} from '@ngx-translate/core';
-import {FormsModule} from '@angular/forms';
-import {UiSwitchModule} from 'ngx-ui-switch';
+import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
+import { NgbDatepickerModule, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { Component } from '@angular/core';
+import { of } from 'rxjs';
+import { AccessControlFormContainerComponent } from './access-control-form-container.component';
+import { BulkAccessControlService } from './bulk-access-control.service';
+import { BulkAccessConfigDataService } from '../../core/config/bulk-access-config-data.service';
+import { Item } from '../../core/shared/item.model';
+import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
+import { createAccessControlInitialFormState } from './access-control-form-container-intial-state';
+import { CommonModule } from '@angular/common';
+import { SharedBrowseByModule } from '../browse-by/shared-browse-by.module';
+import { TranslateModule } from '@ngx-translate/core';
+import { FormsModule } from '@angular/forms';
+import { UiSwitchModule } from 'ngx-ui-switch';
 import {
   ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID
 } from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component';
-import {AccessControlFormModule} from './access-control-form.module';
 
 
 describe('AccessControlFormContainerComponent', () => {
@@ -31,7 +30,6 @@ describe('AccessControlFormContainerComponent', () => {
     imports: [CommonModule,
         FormsModule,
         SharedBrowseByModule,
-        AccessControlFormModule,
         NgbDatepickerModule,
         UiSwitchModule]
 })
@@ -65,7 +63,6 @@ describe('AccessControlFormContainerComponent', () => {
         CommonModule,
         FormsModule,
         SharedBrowseByModule,
-        AccessControlFormModule,
         TranslateModule.forRoot(),
         NgbDatepickerModule,
         UiSwitchModule,
diff --git a/src/app/shared/access-control-form-container/access-control-form.module.ts b/src/app/shared/access-control-form-container/access-control-form.module.ts
deleted file mode 100644
index b0521b5caa..0000000000
--- a/src/app/shared/access-control-form-container/access-control-form.module.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-
-import {TranslateModule} from '@ngx-translate/core';
-import {UiSwitchModule} from 'ngx-ui-switch';
-
-import {AccessControlArrayFormComponent} from './access-control-array-form/access-control-array-form.component';
-import {
-  ItemAccessControlSelectBitstreamsModalComponent
-} from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component';
-import {AccessControlFormContainerComponent} from './access-control-form-container.component';
-import {NgbDatepickerModule} from '@ng-bootstrap/ng-bootstrap';
-import {ToDatePipe} from './access-control-array-form/to-date.pipe';
-
-@NgModule({
-    imports: [
-        CommonModule,
-        TranslateModule,
-        UiSwitchModule,
-        NgbDatepickerModule,
-        AccessControlFormContainerComponent,
-        AccessControlArrayFormComponent,
-        ItemAccessControlSelectBitstreamsModalComponent,
-        ToDatePipe
-    ],
-    exports: [AccessControlFormContainerComponent, AccessControlArrayFormComponent]
-})
-export class AccessControlFormModule {}
diff --git a/src/app/shared/browse-by/shared-browse-by.module.ts b/src/app/shared/browse-by/shared-browse-by.module.ts
index 939b436284..7969ef228a 100644
--- a/src/app/shared/browse-by/shared-browse-by.module.ts
+++ b/src/app/shared/browse-by/shared-browse-by.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { BrowseByComponent } from './browse-by.component';
 import { ThemedBrowseByComponent } from './themed-browse-by.component';
 import { CommonModule } from '@angular/common';
-import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module';
 
 const DECLARATIONS = [
   BrowseByComponent,
@@ -11,10 +10,9 @@ const DECLARATIONS = [
 
 @NgModule({
     imports: [
-        ResultsBackButtonModule,
-        CommonModule,
-        ...DECLARATIONS,
-    ],
+    CommonModule,
+    ...DECLARATIONS
+],
     exports: [
       ...DECLARATIONS,
     ]
diff --git a/src/app/shared/log-in/methods/log-in.methods-decorator.ts b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
index 724d66b38c..bef490635c 100644
--- a/src/app/shared/log-in/methods/log-in.methods-decorator.ts
+++ b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
@@ -13,6 +13,9 @@ export const AUTH_METHOD_FOR_DECORATOR_MAP = new Map<AuthMethodType, AuthMethodT
   [AuthMethodType.Orcid, LogInExternalProviderComponent]
 ]);
 
+/**
+ * @deprecated
+ */
 export function renderAuthMethodFor(authMethodType: AuthMethodType) {
   return function decorator(objectElement: any) {
     if (!objectElement) {
diff --git a/src/app/shared/menu/menu-item.decorator.ts b/src/app/shared/menu/menu-item.decorator.ts
index 8bea8f0c45..af123c7d04 100644
--- a/src/app/shared/menu/menu-item.decorator.ts
+++ b/src/app/shared/menu/menu-item.decorator.ts
@@ -14,6 +14,7 @@ menuMenuItemComponentMap.set(MenuItemType.TEXT, TextMenuItemComponent);
 /**
  * Decorator function to link a MenuItemType to a Component
  * @param {MenuItemType} type The MenuItemType of the MenuSection's model
+ * @deprecated
  * @returns {(sectionComponent: GenericContructor) => void}
  */
 export function rendersMenuItemForType(type: MenuItemType) {
diff --git a/src/app/shared/menu/menu-section.decorator.ts b/src/app/shared/menu/menu-section.decorator.ts
index be4b00727e..ad8ce34d37 100644
--- a/src/app/shared/menu/menu-section.decorator.ts
+++ b/src/app/shared/menu/menu-section.decorator.ts
@@ -38,6 +38,7 @@ menuComponentMap.get(MenuID.DSO_EDIT).get(true).set(DEFAULT_THEME, DsoEditMenuEx
  * Decorator function to render a MenuSection for a menu
  * @param {MenuID} menuID The ID of the Menu in which the section is rendered
  * @param {boolean} expandable True when the section should be expandable, false when if should not
+ * @deprecated
  * @returns {(menuSectionWrapperComponent: GenericConstructor) => void}
  */
 export function rendersSectionForMenu(menuID: MenuID, expandable: boolean, theme = DEFAULT_THEME) {
diff --git a/src/app/shared/metadata-representation/metadata-representation.decorator.ts b/src/app/shared/metadata-representation/metadata-representation.decorator.ts
index b88b486605..322b67976c 100644
--- a/src/app/shared/metadata-representation/metadata-representation.decorator.ts
+++ b/src/app/shared/metadata-representation/metadata-representation.decorator.ts
@@ -74,6 +74,7 @@ export const METADATA_REPRESENTATION_COMPONENT_DECORATOR_MAP =
  * @param mdRepresentationType The metadata representation type the component represents
  * @param context The optional context the component represents
  * @param theme The optional theme for the component
+ * @deprecated
  */
 export function metadataRepresentationComponent(entityType: string, mdRepresentationType: MetadataRepresentationType, context: Context = DEFAULT_CONTEXT, theme = DEFAULT_THEME) {
   return function decorator(component: any) {
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.ts
index f50d85449f..4c98eabba2 100644
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.ts
@@ -75,6 +75,7 @@ export function rendersWorkflowTaskOption(option: string) {
 
 /**
  * Decorator used for rendering AdvancedClaimedTaskActions pages by option type
+ * @deprecated
  */
 export function rendersAdvancedWorkflowTaskOption(option: string) {
   return function decorator(component: any) {
diff --git a/src/app/shared/results-back-button/results-back-button.module.ts b/src/app/shared/results-back-button/results-back-button.module.ts
deleted file mode 100644
index 9b497fbc56..0000000000
--- a/src/app/shared/results-back-button/results-back-button.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
-import { ResultsBackButtonComponent } from './results-back-button.component';
-import { ThemedResultsBackButtonComponent } from './themed-results-back-button.component';
-
-@NgModule({
-    imports: [
-        CommonModule,
-        TranslateModule,
-        ResultsBackButtonComponent,
-        ThemedResultsBackButtonComponent
-    ],
-    exports: [
-        ThemedResultsBackButtonComponent
-    ]
-})
-export class ResultsBackButtonModule {
-
-}
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter-type-decorator.ts b/src/app/shared/search/search-filters/search-filter/search-filter-type-decorator.ts
index b224ad9164..26d47dbd06 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter-type-decorator.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter-type-decorator.ts
@@ -19,6 +19,7 @@ filterTypeMap.set(FilterType.range, SearchRangeFilterComponent);
 /**
  * Sets the mapping for a facet component in relation to a filter type
  * @param {FilterType} type The type for which the matching component is mapped
+ * @deprecated
  * @returns Decorator function that performs the actual mapping on initialization of the facet component
  */
 export function renderFacetFor(type: FilterType) {
diff --git a/src/app/shared/starts-with/starts-with-decorator.ts b/src/app/shared/starts-with/starts-with-decorator.ts
index fc15eca07e..b9feec4951 100644
--- a/src/app/shared/starts-with/starts-with-decorator.ts
+++ b/src/app/shared/starts-with/starts-with-decorator.ts
@@ -18,6 +18,7 @@ export const STARTS_WITH_DECORATOR_MAP = new Map<StartsWithType, StartsWithCompo
 /**
  * Fetch a decorator to render a StartsWith component for type
  * @param type
+ * @deprecated
  */
 export function renderStartsWithFor(type: StartsWithType) {
   return function decorator(objectElement: any) {
diff --git a/src/app/submission/sections/sections-decorator.ts b/src/app/submission/sections/sections-decorator.ts
index 0656f61e0b..01bd0704dd 100644
--- a/src/app/submission/sections/sections-decorator.ts
+++ b/src/app/submission/sections/sections-decorator.ts
@@ -17,6 +17,9 @@ submissionSectionsMap.set(SectionsType.Upload, SubmissionSectionUploadComponent)
 submissionSectionsMap.set(SectionsType.SubmissionForm, SubmissionSectionFormComponent);
 submissionSectionsMap.set(SectionsType.Identifiers, SubmissionSectionIdentifiersComponent);
 
+/**
+ * @deprecated
+ */
 export function renderSectionFor(sectionType: SectionsType) {
   return function decorator(objectElement: any) {
     if (!objectElement) {
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index ace8e1ed15..c4409604f3 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -20,28 +20,32 @@ import {
 import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
 import { ItemSharedModule } from '../../app/item-page/item-shared.module';
 import {
-    CreateCollectionParentSelectorComponent
+  CreateCollectionParentSelectorComponent
 } from './app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
 import {
-    CreateCommunityParentSelectorComponent
+  CreateCommunityParentSelectorComponent
 } from './app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
 import {
-    CreateItemParentSelectorComponent
+  CreateItemParentSelectorComponent
 } from './app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
 import {
-    EditCollectionSelectorComponent
+  EditCollectionSelectorComponent
 } from './app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
 import {
-    EditCommunitySelectorComponent
+  EditCommunitySelectorComponent
 } from './app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
 import {
-    EditItemSelectorComponent
+  EditItemSelectorComponent
 } from './app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
-import { CommunityListElementComponent } from './app/shared/object-list/community-list-element/community-list-element.component';
-import { CollectionListElementComponent} from './app/shared/object-list/collection-list-element/collection-list-element.component';
+import {
+  CommunityListElementComponent
+} from './app/shared/object-list/community-list-element/community-list-element.component';
+import {
+  CollectionListElementComponent
+} from './app/shared/object-list/collection-list-element/collection-list-element.component';
 import { CollectionDropdownComponent } from './app/shared/collection-dropdown/collection-dropdown.component';
 import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
-import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
+
 import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
 import { FileDownloadLinkComponent } from './app/shared/file-download-link/file-download-link.component';
 import { StartsWithDateComponent } from './app/shared/starts-with/date/starts-with-date.component';
@@ -52,9 +56,13 @@ import {
 import {
   ItemSearchResultListElementComponent
 } from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { TopLevelCommunityListComponent } from './app/home-page/top-level-community-list/top-level-community-list.component';
+import {
+  TopLevelCommunityListComponent
+} from './app/home-page/top-level-community-list/top-level-community-list.component';
 import { LogInComponent } from './app/shared/log-in/log-in.component';
-import { BrowseEntryListElementComponent } from './app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component';
+import {
+  BrowseEntryListElementComponent
+} from './app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component';
 import { PersonComponent } from './app/entity-groups/research-entities/item-pages/person/person.component';
 import { LangSwitchComponent } from './app/shared/lang-switch/lang-switch.component';
 
@@ -102,16 +110,15 @@ const DECLARATIONS = [
 
 @NgModule({
     imports: [
-        CommonModule,
-        RootModule,
-        NavbarModule,
-        SharedBrowseByModule,
-        ResultsBackButtonModule,
-        ItemPageModule,
-        ItemSharedModule,
-        DsoPageModule,
-        ...DECLARATIONS
-    ],
+    CommonModule,
+    RootModule,
+    NavbarModule,
+    SharedBrowseByModule,
+    ItemPageModule,
+    ItemSharedModule,
+    DsoPageModule,
+    ...DECLARATIONS
+],
     providers: [
         ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
     ]
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index 60d7604a46..78cfb5dbb7 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -110,7 +110,6 @@ import {
   ExternalSourceEntryImportModalComponent
 } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
 import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
-import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
 import { ItemSharedModule } from '../../app/item-page/item-shared.module';
 import { SearchFiltersComponent } from './app/shared/search/search-filters/search-filters.component';
@@ -126,7 +125,6 @@ import {
 } from './app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component';
 import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
 import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
-import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module';
 import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module';
 import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
 import { ItemAlertsComponent } from './app/item-page/alerts/item-alerts.component';
@@ -260,48 +258,46 @@ const DECLARATIONS = [
 
 @NgModule({
     imports: [
-        AppModule,
-        RootModule,
-        CollectionFormModule,
-        CollectionPageModule,
-        CommonModule,
-        CommunityFormModule,
-        DragDropModule,
-        ItemSharedModule,
-        ItemPageModule,
-        EditItemPageModule,
-        ItemVersionsModule,
-        FormsModule,
-        HttpClientModule,
-        IdlePreloadModule,
-        InfoModule,
-        MenuModule,
-        DsoPageModule,
-        NavbarModule,
-        NgbModule,
-        RegisterEmailFormModule,
-        RouterModule,
-        ScrollToModule,
-        SearchPageModule,
-        SharedBrowseByModule,
-        ResultsBackButtonModule,
-        StatisticsModule,
-        StatisticsPageModule,
-        StoreModule,
-        StoreRouterConnectingModule,
-        TranslateModule,
-        SubmissionModule,
-        MyDSpacePageModule,
-        SearchModule,
-        FormsModule,
-        ResourcePoliciesModule,
-        ComcolModule,
-        DsoSharedModule,
-        SystemWideAlertModule,
-        NgxGalleryModule,
-        FormModule,
-        ...DECLARATIONS
-    ],
+    AppModule,
+    RootModule,
+    CollectionFormModule,
+    CollectionPageModule,
+    CommonModule,
+    CommunityFormModule,
+    DragDropModule,
+    ItemSharedModule,
+    ItemPageModule,
+    EditItemPageModule,
+    ItemVersionsModule,
+    FormsModule,
+    HttpClientModule,
+    IdlePreloadModule,
+    InfoModule,
+    MenuModule,
+    DsoPageModule,
+    NavbarModule,
+    NgbModule,
+    RegisterEmailFormModule,
+    RouterModule,
+    ScrollToModule,
+    SearchPageModule,
+    SharedBrowseByModule,
+    StatisticsModule,
+    StatisticsPageModule,
+    StoreModule,
+    StoreRouterConnectingModule,
+    TranslateModule,
+    SubmissionModule,
+    MyDSpacePageModule,
+    SearchModule,
+    FormsModule,
+    ResourcePoliciesModule,
+    ComcolModule,
+    SystemWideAlertModule,
+    NgxGalleryModule,
+    FormModule,
+    ...DECLARATIONS
+],
     exports: [
         CommunityPageSubCollectionListComponent
     ]
diff --git a/src/themes/dspace/eager-theme.module.ts b/src/themes/dspace/eager-theme.module.ts
index de184a3608..8cdff48ce3 100644
--- a/src/themes/dspace/eager-theme.module.ts
+++ b/src/themes/dspace/eager-theme.module.ts
@@ -7,7 +7,6 @@ import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-na
 import { RootModule } from '../../app/root.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
 import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
-import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 
 /**
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
@@ -25,13 +24,12 @@ const DECLARATIONS = [
 
 @NgModule({
     imports: [
-        CommonModule,
-        SharedBrowseByModule,
-        ResultsBackButtonModule,
-        RootModule,
-        NavbarModule,
-        ...DECLARATIONS
-    ],
+    CommonModule,
+    SharedBrowseByModule,
+    RootModule,
+    NavbarModule,
+    ...DECLARATIONS
+],
     providers: [
         ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
     ]
diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts
index 07a5a700d7..57a1104897 100644
--- a/src/themes/dspace/lazy-theme.module.ts
+++ b/src/themes/dspace/lazy-theme.module.ts
@@ -30,7 +30,6 @@ import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resou
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { RootModule } from '../../app/root.module';
 import { BrowseByPageModule } from '../../app/browse-by/browse-by-page.module';
-import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
 import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
 import { ItemSharedModule } from 'src/app/item-page/item-shared.module';
@@ -43,7 +42,6 @@ const DECLARATIONS = [
     AppModule,
     RootModule,
     BrowseByPageModule,
-    ResultsBackButtonModule,
     CollectionFormModule,
     CollectionPageModule,
     CommonModule,
@@ -75,8 +73,8 @@ const DECLARATIONS = [
     SearchModule,
     FormsModule,
     ResourcePoliciesModule,
-    ComcolModule,
-  ],
+    ComcolModule
+],
   declarations: DECLARATIONS,
 })