diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index fdc26b1e8c..bd2d832c67 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -34,7 +34,6 @@ import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
 import { AngularticsMock } from './shared/mocks/mock-angulartics.service';
 import { AuthServiceMock } from './shared/mocks/mock-auth.service';
 import { AuthService } from './core/auth/auth.service';
-import { Router } from '@angular/router';
 import { MenuService } from './shared/menu/menu.service';
 import { CSSVariableService } from './shared/sass-helper/sass-helper.service';
 import { CSSVariableServiceStub } from './shared/testing/css-variable-service-stub';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 3b5bc1874c..b4cbabe0c5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -8,7 +8,6 @@ import {
   OnChanges,
   Output,
   QueryList,
-  Renderer2,
   SimpleChanges,
   Type,
   ViewChild,
@@ -149,7 +148,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   @Input() group: FormGroup;
   @Input() hasErrorMessaging = false;
   @Input() layout = null as DynamicFormLayout;
-  @Input() model: DynamicFormControlModel;
+  @Input() model: any;
 
   /* tslint:disable:no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
index 35bb6e1e31..2a8cb2456e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
@@ -19,7 +19,6 @@ import { hasValue, isNotEmpty } from '../../../../../empty.util';
 import { GlobalConfig } from '../../../../../../../config/global-config.interface';
 import { GLOBAL_CONFIG } from '../../../../../../../config';
 
-
 @Component({
   selector: 'ds-dynamic-tag',
   styleUrls: ['./dynamic-tag.component.scss'],