diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-still-unemployed/slutredovisning-form-step0-still-unemployed.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-still-unemployed/slutredovisning-form-step0-still-unemployed.component.ts
index c514bc4..a720ccb 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-still-unemployed/slutredovisning-form-step0-still-unemployed.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step0/slutredovisning-form-step0-still-unemployed/slutredovisning-form-step0-still-unemployed.component.ts
@@ -25,11 +25,12 @@ interface CheckboxModel {
 })
 export class SlutredovisningFormStep0StillUnemployedComponent implements OnInit {
   readonly formGroupKey: MainOccupation = MainOccupation.StillUnemployed;
-  @Input() formGroupRef: FormGroup;
-
-  @Input() formData: SlutredovisningFormStep0StillUnemployedFormData;
   StillUnemployedReason = StillUnemployedReason;
+
+  @Input() formGroupRef: FormGroup;
+  @Input() formData: SlutredovisningFormStep0StillUnemployedFormData;
   @Input() shouldValidate: boolean;
+
   @Output() nextClick = new EventEmitter<SlutredovisningFormStep0StillUnemployedFormData>();
   @Output() backClick = new EventEmitter<void>();
 
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts
index d0619f1..5a9bf30 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step3/slutredovisning-form-step3.component.ts
@@ -7,7 +7,7 @@ import { BehaviorSubject } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { SlutredovisningFormData } from '../models/slutredovisning-form-data.model';
 import { SlutredovisningFormService } from '../slutredovisning-form.service';
-import { slutredovisningFormDataToSlutredovisningRequest } from '../utils/form-data-to-slutredovisning.util';
+import { slutredovisningFormDataToSlutredovisningRequest } from '../utils/forms-to-slutredovisning-form-data';
 
 @Component({
   selector: 'msfa-slutredovisning-form-step3',
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts
index 2a82433..8cd3e8d 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form.component.ts
@@ -1,9 +1,9 @@
-import { ChangeDetectionStrategy, Component, OnDestroy } from '@angular/core';
-import { AbstractControl, FormGroup } from '@angular/forms';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { FormGroup } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import { DeltagareAvrop } from '@msfa-models/avrop.model';
 import { addDays } from 'date-fns';
-import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
+import { combineLatest, Observable } from 'rxjs';
 import { map, shareReplay, switchMap } from 'rxjs/operators';
 import { SlutredovisningFormData } from './models/slutredovisning-form-data.model';
 import { SlutredovisningStep0FormData } from './slutredovisning-form-step0/slutredovisning-form-step0.component';
@@ -11,7 +11,7 @@ import { SlutredovisningStep1FormData } from './slutredovisning-form-step1/slutr
 import { SlutredovisningStep2FormData } from './slutredovisning-form-step2/slutredovisning-form-step2.component';
 import { SlutredovisningStep } from './slutredovisning-form.model';
 import { SlutredovisningFormService } from './slutredovisning-form.service';
-import { formsToSlutredovisningFormData } from './utils/form-data-to-slutredovisning.util';
+import { formsToSlutredovisningFormData } from './utils/forms-to-slutredovisning-form-data';
 
 interface Params {
   genomforandeReferens: string;
@@ -24,7 +24,7 @@ interface Params {
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [SlutredovisningFormService],
 })
-export class SlutredovisningFormComponent implements OnDestroy {
+export class SlutredovisningFormComponent {
   totalSteps = 4;
   currentStep$ = this.slutredovisningFormService.currentStep$;
   showAvropDetails$ = this.currentStep$.pipe(map(step => step === 'step0' || step === 'step3'));
@@ -37,8 +37,6 @@ export class SlutredovisningFormComponent implements OnDestroy {
   step1FormData$: Observable<SlutredovisningStep1FormData> = this.slutredovisningFormService.step1FormData$;
   step2FormData$: Observable<SlutredovisningStep2FormData> = this.slutredovisningFormService.step2FormData$;
 
-  shouldValidate$ = new BehaviorSubject<boolean>(false);
-
   genomforandeReferens$: Observable<number> = this.activatedRoute.params.pipe(
     map((params: Params) => +params.genomforandeReferens)
   );
@@ -59,18 +57,8 @@ export class SlutredovisningFormComponent implements OnDestroy {
     shareReplay(1)
   );
 
-  private subscriptions: Subscription[] = [];
-
   constructor(private slutredovisningFormService: SlutredovisningFormService, private activatedRoute: ActivatedRoute) {}
 
-  formControlIsInvalid(formControl: AbstractControl): boolean {
-    return formControl.invalid && (formControl.touched || this.shouldValidate$.value);
-  }
-
-  openConfirmDialog(): void {
-    this.shouldValidate$.next(true);
-  }
-
   private _isAfterEndDate(date: Date): boolean {
     return new Date() > date;
   }
@@ -100,10 +88,6 @@ export class SlutredovisningFormComponent implements OnDestroy {
     }
   }
 
-  ngOnDestroy(): void {
-    this.subscriptions.forEach(subscription => subscription.unsubscribe());
-  }
-
   getStepIndex(step: SlutredovisningStep): number {
     switch (step) {
       case 'step0':
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/utils/form-data-to-slutredovisning.util.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/utils/forms-to-slutredovisning-form-data.ts
similarity index 100%
rename from apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/utils/form-data-to-slutredovisning.util.ts
rename to apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/utils/forms-to-slutredovisning-form-data.ts