diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2fba48c8b2..750d63beda 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,7 +1,6 @@
 import { APP_BASE_HREF, CommonModule, DOCUMENT } from '@angular/common';
 import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { AbstractControl } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 491d394e73..6790d9a3bb 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -2,7 +2,6 @@ import { CommonModule } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
 
-import { DynamicFormLayoutService, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 import { EffectsModule } from '@ngrx/effects';
 
 import { Action, StoreConfig, StoreModule } from '@ngrx/store';
@@ -23,7 +22,6 @@ import { ObjectSelectService } from '../shared/object-select/object-select.servi
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { CSSVariableService } from '../shared/sass-helper/sass-helper.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
-import { SectionFormOperationsService } from '../submission/sections/form/section-form-operations.service';
 import { AuthenticatedGuard } from './auth/authenticated.guard';
 import { AuthStatus } from './auth/models/auth-status.model';
 import { BrowseService } from './browse/browse.service';
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index cf2b6ef167..5e3742e5b9 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -394,10 +394,6 @@ const COMPONENTS = [
   ItemDetailPreviewComponent,
   ItemDetailPreviewFieldComponent,
   ClaimedTaskActionsComponent,
-  ClaimedTaskActionsApproveComponent,
-  ClaimedTaskActionsRejectComponent,
-  ClaimedTaskActionsReturnToPoolComponent,
-  ClaimedTaskActionsEditMetadataComponent,
   ClaimedTaskActionsLoaderComponent,
   ItemActionsComponent,
   PoolTaskActionsComponent,
@@ -412,87 +408,30 @@ const COMPONENTS = [
   ValidationSuggestionsComponent,
   DsoInputSuggestionsComponent,
   DSOSelectorComponent,
-  CreateCommunityParentSelectorComponent,
-  ThemedCreateCommunityParentSelectorComponent,
-  CreateCollectionParentSelectorComponent,
-  ThemedCreateCollectionParentSelectorComponent,
-  CreateItemParentSelectorComponent,
-  ThemedCreateItemParentSelectorComponent,
-  EditCommunitySelectorComponent,
-  ThemedEditCommunitySelectorComponent,
-  EditCollectionSelectorComponent,
-  ThemedEditCollectionSelectorComponent,
-  EditItemSelectorComponent,
-  ThemedEditItemSelectorComponent,
-  CommunitySearchResultListElementComponent,
-  CollectionSearchResultListElementComponent,
-  BrowseByComponent,
-
-  CollectionSearchResultGridElementComponent,
-  CommunitySearchResultGridElementComponent,
   SearchExportCsvComponent,
   PageSizeSelectorComponent,
   ListableObjectComponentLoaderComponent,
-  CollectionListElementComponent,
-  CommunityListElementComponent,
-  CollectionGridElementComponent,
-  CommunityGridElementComponent,
-  BrowseByComponent,
   AbstractTrackableComponent,
   ComcolMetadataComponent,
   TypeBadgeComponent,
   AccessStatusBadgeComponent,
-  BrowseByComponent,
-  AbstractTrackableComponent,
-
   ItemSelectComponent,
   CollectionSelectComponent,
   MetadataRepresentationLoaderComponent,
   SelectableListItemControlComponent,
-
   ImportableListItemControlComponent,
-
-  LogInShibbolethComponent,
-  LogInOidcComponent,
-  LogInOrcidComponent,
-  LogInPasswordComponent,
   LogInContainerComponent,
   ItemVersionsComponent,
-  ItemSearchResultListElementComponent,
   ItemVersionsNoticeComponent,
   ModifyItemOverviewComponent,
   ImpersonateNavbarComponent,
-  FileDownloadLinkComponent,
-  BitstreamDownloadPageComponent,
-  BitstreamRequestACopyPageComponent,
-  CollectionDropdownComponent,
   EntityDropdownComponent,
   ExportMetadataSelectorComponent,
   ImportBatchSelectorComponent,
   ExportBatchSelectorComponent,
   ConfirmationModalComponent,
   AuthorizedCollectionSelectorComponent,
-  CurationFormComponent,
-  SearchResultListElementComponent,
-  SearchResultGridElementComponent,
-  ItemListElementComponent,
-  ItemGridElementComponent,
-  ItemSearchResultGridElementComponent,
-  BrowseEntryListElementComponent,
-  SearchResultDetailElementComponent,
-  PlainTextMetadataListElementComponent,
-  ItemMetadataListElementComponent,
-  MetadataRepresentationListElementComponent,
-  ItemMetadataRepresentationListElementComponent,
-  BundleListElementComponent,
-  StartsWithDateComponent,
-  StartsWithTextComponent,
-  SidebarSearchListElementComponent,
-  PublicationSidebarSearchListElementComponent,
-  CollectionSidebarSearchListElementComponent,
-  CommunitySidebarSearchListElementComponent,
   SearchNavbarComponent,
-  ScopeSelectorModalComponent,
   ItemPageTitleFieldComponent,
   ThemedSearchNavbarComponent,
 ];
@@ -605,6 +544,7 @@ const DIRECTIVES = [
   declarations: [
     ...PIPES,
     ...COMPONENTS,
+    ...ENTRY_COMPONENTS,
     ...DIRECTIVES,
     ...SHARED_ITEM_PAGE_COMPONENTS,
     ItemVersionsSummaryModalComponent,
@@ -617,9 +557,10 @@ const DIRECTIVES = [
     ...MODULES,
     ...PIPES,
     ...COMPONENTS,
+    ...ENTRY_COMPONENTS,
     ...SHARED_ITEM_PAGE_COMPONENTS,
     ...DIRECTIVES,
-    TranslateModule
+    TranslateModule,
   ]
 })