diff --git a/src/app/+admin/admin-access-control/admin-access-control.module.ts b/src/app/+admin/admin-access-control/admin-access-control.module.ts
index a7a59aba61..04051ff46c 100644
--- a/src/app/+admin/admin-access-control/admin-access-control.module.ts
+++ b/src/app/+admin/admin-access-control/admin-access-control.module.ts
@@ -1,7 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../../shared/shared.module';
 import { AdminAccessControlRoutingModule } from './admin-access-control-routing.module';
 import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
@@ -16,7 +15,6 @@ import { GroupsRegistryComponent } from './group-registry/groups-registry.compon
     CommonModule,
     SharedModule,
     RouterModule,
-    TranslateModule,
     AdminAccessControlRoutingModule
   ],
   declarations: [
diff --git a/src/app/+admin/admin-registries/admin-registries.module.ts b/src/app/+admin/admin-registries/admin-registries.module.ts
index 91694342ab..5c82bb2ec9 100644
--- a/src/app/+admin/admin-registries/admin-registries.module.ts
+++ b/src/app/+admin/admin-registries/admin-registries.module.ts
@@ -4,7 +4,6 @@ import { AdminRegistriesRoutingModule } from './admin-registries-routing.module'
 import { CommonModule } from '@angular/common';
 import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
 import { RouterModule } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { SharedModule } from '../../shared/shared.module';
 import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component';
 import { MetadataFieldFormComponent } from './metadata-schema/metadata-field-form/metadata-field-form.component';
@@ -15,7 +14,6 @@ import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.mo
     CommonModule,
     SharedModule,
     RouterModule,
-    TranslateModule,
     BitstreamFormatsModule,
     AdminRegistriesRoutingModule
   ],
diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.module.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
index 58af0b2e8a..1667a07c0b 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { BitstreamFormatsComponent } from './bitstream-formats.component';
 import { SharedModule } from '../../../shared/shared.module';
 import { FormatFormComponent } from './format-form/format-form.component';
@@ -14,7 +13,6 @@ import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstrea
     CommonModule,
     SharedModule,
     RouterModule,
-    TranslateModule,
     BitstreamFormatsRoutingModule
   ],
   declarations: [
diff --git a/src/app/entity-groups/journal-entities/journal-entities.module.ts b/src/app/entity-groups/journal-entities/journal-entities.module.ts
index 4077d5dafb..bc6676372c 100644
--- a/src/app/entity-groups/journal-entities/journal-entities.module.ts
+++ b/src/app/entity-groups/journal-entities/journal-entities.module.ts
@@ -18,7 +18,7 @@ import { JournalVolumeSearchResultListElementComponent } from './item-list-eleme
 import { JournalIssueSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
 import { JournalVolumeSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component';
 
-const ENTRY_COMPONENTS = [
+const COMPONENTS = [
   JournalComponent,
   JournalIssueComponent,
   JournalVolumeComponent,
@@ -43,7 +43,7 @@ const ENTRY_COMPONENTS = [
     ItemPageModule
   ],
   declarations: [
-    ...ENTRY_COMPONENTS
+    ...COMPONENTS
   ]
 })
 export class JournalEntitiesModule {
diff --git a/src/app/entity-groups/research-entities/research-entities.module.ts b/src/app/entity-groups/research-entities/research-entities.module.ts
index 308370078a..dacf62b60d 100644
--- a/src/app/entity-groups/research-entities/research-entities.module.ts
+++ b/src/app/entity-groups/research-entities/research-entities.module.ts
@@ -26,7 +26,7 @@ import { OrgUnitInputSuggestionsComponent } from './submission/item-list-element
 import { OrgUnitSearchResultListSubmissionElementComponent } from './submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component';
 import { ExternalSourceEntryListSubmissionElementComponent } from './submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component';
 
-const ENTRY_COMPONENTS = [
+const COMPONENTS = [
   OrgUnitComponent,
   PersonComponent,
   ProjectComponent,
@@ -59,7 +59,7 @@ const ENTRY_COMPONENTS = [
     ItemPageModule
   ],
   declarations: [
-    ...ENTRY_COMPONENTS,
+    ...COMPONENTS,
   ]
 })
 export class ResearchEntitiesModule {
diff --git a/src/app/navbar/navbar.module.ts b/src/app/navbar/navbar.module.ts
index 363662d614..5be6453e7f 100644
--- a/src/app/navbar/navbar.module.ts
+++ b/src/app/navbar/navbar.module.ts
@@ -1,12 +1,14 @@
-import { SharedModule } from '../shared/shared.module';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+
 import { EffectsModule } from '@ngrx/effects';
+
 import { CoreModule } from '../core/core.module';
 import { NavbarEffects } from './navbar.effects';
 import { NavbarSectionComponent } from './navbar-section/navbar-section.component';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section/expandable-navbar-section.component';
 import { NavbarComponent } from './navbar.component';
+import { MenuModule } from '../shared/menu/menu.module';
 
 const effects = [
   NavbarEffects
@@ -15,7 +17,7 @@ const effects = [
 @NgModule({
   imports: [
     CommonModule,
-    SharedModule,
+    MenuModule,
     EffectsModule.forFeature(effects),
     CoreModule.forRoot()
   ],
diff --git a/src/app/shared/menu/menu.module.ts b/src/app/shared/menu/menu.module.ts
index 934700f742..e9430299cc 100644
--- a/src/app/shared/menu/menu.module.ts
+++ b/src/app/shared/menu/menu.module.ts
@@ -16,12 +16,6 @@ const COMPONENTS = [
   OnClickMenuItemComponent
 ];
 
-const ENTRY_COMPONENTS = [
-  LinkMenuItemComponent,
-  TextMenuItemComponent,
-  OnClickMenuItemComponent
-];
-
 const MODULES = [
   TranslateModule,
   RouterModule,
@@ -36,8 +30,7 @@ const PROVIDERS = [
     ...MODULES
   ],
   declarations: [
-    ...COMPONENTS,
-    ...ENTRY_COMPONENTS,
+    ...COMPONENTS
   ],
   providers: [
     ...PROVIDERS
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index fffa9bc080..4bf716c438 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -98,7 +98,6 @@ import { InputSuggestionsComponent } from './input-suggestions/input-suggestions
 import { CapitalizePipe } from './utils/capitalize.pipe';
 import { ObjectKeysPipe } from './utils/object-keys-pipe';
 import { AuthorityConfidenceStateDirective } from './authority-confidence/authority-confidence-state.directive';
-import { MenuModule } from './menu/menu.module';
 import { LangSwitchComponent } from './lang-switch/lang-switch.component';
 import { PlainTextMetadataListElementComponent } from './object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
 import { ItemMetadataListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
@@ -229,7 +228,6 @@ const MODULES = [
   NouisliderModule,
   MomentModule,
   TextMaskModule,
-  MenuModule,
   DragDropModule,
   CdkTreeModule
 ];
@@ -350,7 +348,6 @@ const COMPONENTS = [
   SearchFacetFilterComponent,
   SearchLabelsComponent,
   SearchLabelComponent,
-  SearchFacetFilterComponent,
   SearchFacetFilterWrapperComponent,
   SearchRangeFilterComponent,
   SearchTextFilterComponent,
@@ -362,8 +359,6 @@ const COMPONENTS = [
   SearchSwitchConfigurationComponent,
   SearchAuthorityFilterComponent,
   PageSizeSelectorComponent,
-  CommunitySearchResultGridElementComponent,
-  CollectionSearchResultGridElementComponent,
   ListableObjectComponentLoaderComponent,
   CollectionListElementComponent,
   CommunityListElementComponent,
@@ -401,87 +396,25 @@ const COMPONENTS = [
   CollectionDropdownComponent,
   ExportMetadataSelectorComponent,
   ConfirmationModalComponent,
-  VocabularyTreeviewComponent
-];
-
-const ENTRY_COMPONENTS = [
-  // put shared entry components (components that are created dynamically) here
-  CollectionListElementComponent,
-  CommunityListElementComponent,
-  SearchResultListElementComponent,
-  CommunitySearchResultListElementComponent,
-  CollectionSearchResultListElementComponent,
-  CollectionGridElementComponent,
-  CommunityGridElementComponent,
-  CommunitySearchResultGridElementComponent,
-  CollectionSearchResultGridElementComponent,
-  SearchResultGridElementComponent,
+  VocabularyTreeviewComponent,
+  CurationFormComponent,
   PublicationListElementComponent,
-  PublicationGridElementComponent,
-  PublicationSearchResultListElementComponent,
-  PublicationSearchResultGridElementComponent,
-  BrowseEntryListElementComponent,
-  SearchResultDetailElementComponent,
+  SearchResultListElementComponent,
   SearchResultGridElementComponent,
-  DsDynamicListComponent,
-  DsDynamicLookupComponent,
-  DsDynamicDisabledComponent,
-  DsDynamicLookupRelationModalComponent,
-  DsDynamicScrollableDropdownComponent,
-  DsDynamicTagComponent,
-  DsDynamicOneboxComponent,
-  DsDynamicRelationGroupComponent,
-  DsDatePickerComponent,
-  DsDynamicFormGroupComponent,
-  DsDynamicFormArrayComponent,
-  DsDatePickerInlineComponent,
-  StartsWithDateComponent,
-  StartsWithTextComponent,
-  DSOSelectorComponent,
-  CreateCommunityParentSelectorComponent,
-  CreateCollectionParentSelectorComponent,
-  CreateItemParentSelectorComponent,
-  EditCommunitySelectorComponent,
-  EditCollectionSelectorComponent,
-  EditItemSelectorComponent,
-  StartsWithTextComponent,
+  SearchResultDetailElementComponent,
+  BrowseEntryListElementComponent,
   PlainTextMetadataListElementComponent,
   ItemMetadataListElementComponent,
   MetadataRepresentationListElementComponent,
-  CustomSwitchComponent,
-  ItemMetadataRepresentationListElementComponent,
-  SearchResultsComponent,
-  CollectionSearchResultGridElementComponent,
-  CommunitySearchResultGridElementComponent,
-  SearchFacetFilterComponent,
-  SearchRangeFilterComponent,
-  SearchTextFilterComponent,
-  SearchHierarchyFilterComponent,
-  SearchBooleanFilterComponent,
-  SearchFacetOptionComponent,
-  SearchFacetSelectedOptionComponent,
-  SearchFacetRangeOptionComponent,
-  SearchAuthorityFilterComponent,
   DsDynamicLookupRelationSearchTabComponent,
   DsDynamicLookupRelationSelectionTabComponent,
+  PublicationGridElementComponent,
+  PublicationSearchResultGridElementComponent,
+  ItemMetadataRepresentationListElementComponent,
   DsDynamicLookupRelationExternalSourceTabComponent,
-  ExternalSourceEntryImportModalComponent,
-  ExistingRelationListElementComponent,
-  LogInPasswordComponent,
-  LogInShibbolethComponent,
-  ItemVersionsComponent,
   BundleListElementComponent,
-  ItemVersionsNoticeComponent,
-  ClaimedTaskActionsApproveComponent,
-  ClaimedTaskActionsRejectComponent,
-  ClaimedTaskActionsReturnToPoolComponent,
-  ClaimedTaskActionsEditMetadataComponent,
-  CollectionDropdownComponent,
-  FileDownloadLinkComponent,
-  CurationFormComponent,
-  ExportMetadataSelectorComponent,
-  ConfirmationModalComponent,
-  VocabularyTreeviewComponent
+  StartsWithDateComponent,
+  StartsWithTextComponent
 ];
 
 const SHARED_ITEM_PAGE_COMPONENTS = [
@@ -522,14 +455,13 @@ const DIRECTIVES = [
 
 @NgModule({
   imports: [
-    ...ROOT_MODULES,
     ...MODULES,
+    ...ROOT_MODULES
   ],
   declarations: [
     ...PIPES,
     ...COMPONENTS,
     ...DIRECTIVES,
-    ...ENTRY_COMPONENTS,
     ...SHARED_ITEM_PAGE_COMPONENTS
   ],
   providers: [
@@ -541,6 +473,7 @@ const DIRECTIVES = [
     ...COMPONENTS,
     ...SHARED_ITEM_PAGE_COMPONENTS,
     ...DIRECTIVES,
+    TranslateModule,
     CurationFormComponent
   ]
 })
diff --git a/src/app/statistics-page/statistics-page.module.ts b/src/app/statistics-page/statistics-page.module.ts
index 068ded63aa..9957d4b0d7 100644
--- a/src/app/statistics-page/statistics-page.module.ts
+++ b/src/app/statistics-page/statistics-page.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+
 import { CoreModule } from '../core/core.module';
 import { SharedModule } from '../shared/shared.module';
 import { StatisticsModule } from '../statistics/statistics.module';
@@ -15,7 +16,7 @@ const components = [
   SiteStatisticsPageComponent,
   ItemStatisticsPageComponent,
   CollectionStatisticsPageComponent,
-  CommunityStatisticsPageComponent,
+  CommunityStatisticsPageComponent
 ];
 
 @NgModule({
diff --git a/src/app/statistics/statistics.module.ts b/src/app/statistics/statistics.module.ts
index b82167106f..f4d515030c 100644
--- a/src/app/statistics/statistics.module.ts
+++ b/src/app/statistics/statistics.module.ts
@@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
 import { CoreModule } from '../core/core.module';
 import { SharedModule } from '../shared/shared.module';
 import { ViewTrackerComponent } from './angulartics/dspace/view-tracker.component';
-import { StatisticsService } from './statistics.service';
 
 @NgModule({
   imports: [
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index 6cac813525..951ddae4ac 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -1,5 +1,4 @@
 import { NgModule } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
 import { CoreModule } from '../core/core.module';
 import { SharedModule } from '../shared/shared.module';
 
@@ -40,8 +39,7 @@ import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/subm
     CoreModule.forRoot(),
     SharedModule,
     StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
-    EffectsModule.forFeature(submissionEffects),
-    TranslateModule
+    EffectsModule.forFeature(submissionEffects)
   ],
   declarations: [
     SubmissionSectionUploadAccessConditionsComponent,