diff --git a/src/app/shared/empty.util.spec.ts b/src/app/shared/empty.util.spec.ts
index 7516e08ca7..94122990ae 100644
--- a/src/app/shared/empty.util.spec.ts
+++ b/src/app/shared/empty.util.spec.ts
@@ -457,28 +457,28 @@ describe('Empty Utils', () => {
     */
     it('should be empty if no parameter passed', () => {
       expect(isObjectEmpty()).toBeTrue();
-    })
+    });
     it('should be empty if null parameter passed', () => {
       expect(isObjectEmpty(null)).toBeTrue();
-    })
+    });
     it('should be empty if undefined parameter passed', () => {
       expect(isObjectEmpty(undefined)).toBeTrue();
-    })
+    });
     it('should be empty if empty string passed', () => {
       expect(isObjectEmpty('')).toBeTrue();
-    })
+    });
     it('should be empty if empty array passed', () => {
       expect(isObjectEmpty([])).toBeTrue();
-    })
+    });
     it('should be empty if empty object passed', () => {
       expect(isObjectEmpty({})).toBeTrue();
-    })
+    });
     it('should be empty if single key with null value passed', () => {
       expect(isObjectEmpty({ name: null })).toBeTrue();
-    })
+    });
     it('should NOT be empty if object with at least one non-null value passed', () => {
       expect(isObjectEmpty({ name: 'Adam Hawkins', surname : null })).toBeFalse();
-    })
+    });
   });
 
   describe('ensureArrayHasValue', () => {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
index 39f754af24..f8a7376c3e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable, Injector, Optional } from '@angular/core';
 import { FormControl } from '@angular/forms';
 
 import { Subscription } from 'rxjs';
-import {map, startWith} from 'rxjs/operators';
+import { startWith } from 'rxjs/operators';
 
 import {
   AND_OPERATOR,
@@ -19,8 +19,6 @@ import {hasNoValue, hasValue, isEmpty} from '../../../empty.util';
 import { FormBuilderService } from '../form-builder.service';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
-import {getFirstCompletedRemoteData} from "../../../../core/shared/operators";
-import {ConfigurationDataService} from "../../../../core/data/configuration-data.service";
 
 /**
  * Service to manage type binding for submission input fields
diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index 0a613cbb84..ac9c2b652b 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -48,9 +48,9 @@ import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-conca
 import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
-import {ConfigurationDataService} from "../../../core/data/configuration-data.service";
-import {createSuccessfulRemoteDataObject$} from "../../remote-data.utils";
-import {ConfigurationProperty} from "../../../core/shared/configuration-property.model";
+import {ConfigurationDataService} from '../../../core/data/configuration-data.service';
+import {createSuccessfulRemoteDataObject$} from '../../remote-data.utils';
+import {ConfigurationProperty} from '../../../core/shared/configuration-property.model';
 
 describe('FormBuilderService test suite', () => {
 
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 6d244aad2c..9dac46a8aa 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -41,9 +41,8 @@ import { dateToString, isNgbDateStruct } from '../../date.util';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-ui/ds-dynamic-form-constants';
 import { CONCAT_GROUP_SUFFIX, DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
 import { VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
-import { environment } from '../../../../environments/environment';
-import {ConfigurationDataService} from "../../../core/data/configuration-data.service";
-import {getFirstCompletedRemoteData} from "../../../core/shared/operators";
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 @Injectable()
 export class FormBuilderService extends DynamicFormService {
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 35743ec9b7..bd6820d4b3 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -3,7 +3,7 @@ import {Inject, InjectionToken} from '@angular/core';
 import { uniqueId } from 'lodash';
 import {DynamicFormControlLayout, DynamicFormControlRelation, MATCH_VISIBLE, OR_OPERATOR} from '@ng-dynamic-forms/core';
 
-import {hasValue, isEmpty, isNotEmpty, isNotNull, isNotUndefined} from '../../../empty.util';
+import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../empty.util';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import {
@@ -17,9 +17,6 @@ import { RelationshipOptions } from '../models/relationship-options.model';
 import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { ParserType } from './parser-type';
 import { isNgbDateStruct } from '../../../date.util';
-import { environment } from '../../../../../environments/environment';
-import {getFirstCompletedRemoteData} from "../../../../core/shared/operators";
-import {map} from "rxjs/operators";
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
diff --git a/src/app/shared/mocks/find-id-config-data.service.mock.ts b/src/app/shared/mocks/find-id-config-data.service.mock.ts
index d378466fcc..b755bb1673 100644
--- a/src/app/shared/mocks/find-id-config-data.service.mock.ts
+++ b/src/app/shared/mocks/find-id-config-data.service.mock.ts
@@ -1,5 +1,5 @@
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import {ConfigurationProperty} from "../../core/shared/configuration-property.model";
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
 
 export function getMockFindByIdDataService(propertyKey: string, ...values: string[]) {
   return jasmine.createSpyObj('findByIdDataService', {
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index d9b83d9864..05aa765054 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -42,7 +42,6 @@ import { NgbAccordionModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
 import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
 import { SubmissionAccessesConfigService } from '../core/config/submission-accesses-config.service';
 import { SectionAccessesService } from './sections/accesses/section-accesses.service';
-import {ConfigurationDataService} from "../core/data/configuration-data.service";
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator