diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
deleted file mode 100644
index add860fd77..0000000000
--- a/src/app/submission/submission.module.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import {
-  CommonModule,
-  NgOptimizedImage,
-} from '@angular/common';
-import { NgModule } from '@angular/core';
-import {
-  NgbAccordionModule,
-  NgbCollapseModule,
-  NgbModalModule,
-} from '@ng-bootstrap/ng-bootstrap';
-import { EffectsModule } from '@ngrx/effects';
-import {
-  Action,
-  StoreConfig,
-  StoreModule,
-} from '@ngrx/store';
-
-import { LdnServicesService } from '../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
-import { storeModuleConfig } from '../app.reducer';
-import { SubmissionAccessesConfigDataService } from '../core/config/submission-accesses-config-data.service';
-import { SubmissionUploadsConfigDataService } from '../core/config/submission-uploads-config-data.service';
-import { SubmissionEditComponent } from './edit/submission-edit.component';
-import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.component';
-import { SubmissionFormCollectionComponent } from './form/collection/submission-form-collection.component';
-import { SubmissionFormFooterComponent } from './form/footer/submission-form-footer.component';
-import { SubmissionFormSectionAddComponent } from './form/section-add/submission-form-section-add.component';
-import { SubmissionFormComponent } from './form/submission-form.component';
-import { SubmissionUploadFilesComponent } from './form/submission-upload-files/submission-upload-files.component';
-import { SubmissionImportExternalCollectionComponent } from './import-external/import-external-collection/submission-import-external-collection.component';
-import { SubmissionImportExternalPreviewComponent } from './import-external/import-external-preview/submission-import-external-preview.component';
-import { SubmissionImportExternalSearchbarComponent } from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
-import { SubmissionImportExternalComponent } from './import-external/submission-import-external.component';
-import { ThemedSubmissionImportExternalComponent } from './import-external/themed-submission-import-external.component';
-import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
-import { SectionAccessesService } from './sections/accesses/section-accesses.service';
-import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
-import { SubmissionSectionContainerComponent } from './sections/container/section-container.component';
-import { SubmissionSectionDuplicatesComponent } from './sections/duplicates/section-duplicates.component';
-import { SubmissionSectionFormComponent } from './sections/form/section-form.component';
-import { SectionFormOperationsService } from './sections/form/section-form-operations.service';
-import { SubmissionSectionIdentifiersComponent } from './sections/identifiers/section-identifiers.component';
-import { SubmissionSectionLicenseComponent } from './sections/license/section-license.component';
-import { CoarNotifyConfigDataService } from './sections/section-coar-notify/coar-notify-config-data.service';
-import { SubmissionSectionCoarNotifyComponent } from './sections/section-coar-notify/section-coar-notify.component';
-import { SectionsDirective } from './sections/sections.directive';
-import { SectionsService } from './sections/sections.service';
-import { ContentAccordionComponent } from './sections/sherpa-policies/content-accordion/content-accordion.component';
-import { MetadataInformationComponent } from './sections/sherpa-policies/metadata-information/metadata-information.component';
-import { PublicationInformationComponent } from './sections/sherpa-policies/publication-information/publication-information.component';
-import { PublisherPolicyComponent } from './sections/sherpa-policies/publisher-policy/publisher-policy.component';
-import { SubmissionSectionSherpaPoliciesComponent } from './sections/sherpa-policies/section-sherpa-policies.component';
-import { SubmissionSectionUploadAccessConditionsComponent } from './sections/upload/accessConditions/submission-section-upload-access-conditions.component';
-import { SubmissionSectionUploadFileEditComponent } from './sections/upload/file/edit/section-upload-file-edit.component';
-import { SubmissionSectionUploadFileComponent } from './sections/upload/file/section-upload-file.component';
-import { ThemedSubmissionSectionUploadFileComponent } from './sections/upload/file/themed-section-upload-file.component';
-import { SubmissionSectionUploadFileViewComponent } from './sections/upload/file/view/section-upload-file-view.component';
-import { SubmissionSectionUploadComponent } from './sections/upload/section-upload.component';
-import { SectionUploadService } from './sections/upload/section-upload.service';
-import { submissionEffects } from './submission.effects';
-import {
-  submissionReducers,
-  SubmissionState,
-} from './submission.reducers';
-import { SubmissionSubmitComponent } from './submit/submission-submit.component';
-import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
-
-const ENTRY_COMPONENTS = [
-  // put only entry components that use custom decorator
-  SubmissionSectionUploadComponent,
-  SubmissionSectionFormComponent,
-  SubmissionSectionLicenseComponent,
-  SubmissionSectionCcLicensesComponent,
-  SubmissionSectionAccessesComponent,
-  SubmissionSectionSherpaPoliciesComponent,
-  SubmissionSectionCoarNotifyComponent,
-  SubmissionSectionDuplicatesComponent,
-];
-
-const DECLARATIONS = [
-  ...ENTRY_COMPONENTS,
-  SectionsDirective,
-  SubmissionEditComponent,
-  ThemedSubmissionEditComponent,
-  SubmissionFormSectionAddComponent,
-  SubmissionFormCollectionComponent,
-  SubmissionFormComponent,
-  SubmissionFormFooterComponent,
-  SubmissionSubmitComponent,
-  ThemedSubmissionSubmitComponent,
-  SubmissionUploadFilesComponent,
-  SubmissionSectionContainerComponent,
-  SubmissionSectionUploadAccessConditionsComponent,
-  SubmissionSectionUploadFileComponent,
-  SubmissionSectionUploadFileEditComponent,
-  SubmissionSectionUploadFileViewComponent,
-  SubmissionSectionIdentifiersComponent,
-  SubmissionSectionDuplicatesComponent,
-  SubmissionImportExternalComponent,
-  ThemedSubmissionImportExternalComponent,
-  SubmissionImportExternalSearchbarComponent,
-  SubmissionImportExternalPreviewComponent,
-  SubmissionImportExternalCollectionComponent,
-  ContentAccordionComponent,
-  PublisherPolicyComponent,
-  PublicationInformationComponent,
-  MetadataInformationComponent,
-  ThemedSubmissionSectionUploadFileComponent,
-];
-
-@NgModule({
-  imports: [
-    CommonModule,
-    StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
-    EffectsModule.forFeature(),
-    EffectsModule.forFeature(submissionEffects),
-    NgbModalModule,
-    NgbCollapseModule,
-    NgbAccordionModule,
-    NgOptimizedImage,
-    ...DECLARATIONS,
-  ],
-  exports: [
-    ...DECLARATIONS,
-  ],
-  providers: [
-    SectionUploadService,
-    SectionsService,
-    SubmissionUploadsConfigDataService,
-    SubmissionAccessesConfigDataService,
-    SectionAccessesService,
-    SectionFormOperationsService,
-    CoarNotifyConfigDataService,
-    LdnServicesService,
-  ],
-})
-
-/**
- * This module handles all components that are necessary for the submission process
- */
-export class SubmissionModule {
-  /**
-   * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during SSR otherwise
-   */
-  static withEntryComponents() {
-    return {
-      ngModule: SubmissionModule,
-      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 74885b55c6..64305a40ad 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -14,7 +14,6 @@ import { IdlePreloadModule } from 'angular-idle-preload';
 
 import { AppModule } from '../../app/app.module';
 import { RootModule } from '../../app/root.module';
-import { SubmissionModule } from '../../app/submission/submission.module';
 import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module';
 import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
 import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
@@ -201,7 +200,6 @@ const DECLARATIONS = [
     StoreModule,
     StoreRouterConnectingModule,
     TranslateModule,
-    SubmissionModule,
     FormsModule,
     SystemWideAlertModule,
     NgxGalleryModule,
diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts
index 3acf9bdac9..c568fb7e09 100644
--- a/src/themes/dspace/lazy-theme.module.ts
+++ b/src/themes/dspace/lazy-theme.module.ts
@@ -13,7 +13,6 @@ import { IdlePreloadModule } from 'angular-idle-preload';
 
 import { AppModule } from '../../app/app.module';
 import { RootModule } from '../../app/root.module';
-import { SubmissionModule } from '../../app/submission/submission.module';
 
 const DECLARATIONS = [
 ];
@@ -33,7 +32,6 @@ const DECLARATIONS = [
     StoreModule,
     StoreRouterConnectingModule,
     TranslateModule,
-    SubmissionModule,
     FormsModule,
   ],
   declarations: DECLARATIONS,