diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.state.ts b/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.state.ts
index b97a34207c082a2250a3dc7a10c8689179af066d..cc642375a38113d686e2179be6d06f59843ca51a 100644
--- a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.state.ts
+++ b/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.state.ts
@@ -1,8 +1,6 @@
-import {JobHistoryRequestData} from '@ghsc/nshmp-lib-ng/aws';
-import {TerminateJobRequestData} from '@ghsc/nshmp-lib-no-ngrx/aws';
 import {DynamoDBItem} from '@ghsc/nshmp-utils-ts/libs/aws/run-nshmp-haz';
 import {Response} from '@ghsc/nshmp-utils-ts/libs/nshmp-ws-utils';
-import {EC2} from 'aws-sdk';
+import {TerminateJobState} from 'projects/nshmp-apps/src/shared/state/aws';
 
 import {
   GetLogsRequestData,
@@ -12,18 +10,11 @@ import {
 /**
  * Application NGRX state.
  */
-export interface AppState {
-  /** Job history response */
-  jobHistoryResponse: Response<JobHistoryRequestData, DynamoDBItem>;
+export interface AppState extends TerminateJobState<DynamoDBItem> {
   /** Whether log service is loading */
   serviceLoading: boolean;
   /** Log service response. */
   serviceResponse: Response<GetLogsRequestData, GetLogsResponseData>;
-  /** Terminate job response */
-  terminateJobResponse: Response<
-    TerminateJobRequestData,
-    EC2.InstanceStateChangeList
-  >;
 }
 
 /**
diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.state.ts b/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.state.ts
index 7f68452bac71bf406231f328a04c6f047b1c6c33..d6897b391e817a9d830de341757363333ec20ba9 100644
--- a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.state.ts
+++ b/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.state.ts
@@ -1,7 +1,6 @@
 import {nshmpUtils} from '@ghsc/nshmp-lib-ng/nshmp';
-import {JobHistoryRequestData} from '@ghsc/nshmp-lib-no-ngrx/aws';
 import {DynamoDBItem} from '@ghsc/nshmp-utils-ts/libs/aws/run-nshmp-haz';
-import {Response} from '@ghsc/nshmp-utils-ts/libs/nshmp-ws-utils';
+import {JobHistoryState} from 'projects/nshmp-apps/src/shared/state/aws';
 
 import {ControlForm} from '../models/control-form.model';
 
@@ -14,9 +13,8 @@ export const DEFAULT_FORM_VALUES: ControlForm = {
 /**
  * Application state
  */
-export interface AppState {
+export interface AppState extends JobHistoryState<DynamoDBItem[]> {
   filteredHistory: DynamoDBItem[];
-  jobHistoryResponse: Response<JobHistoryRequestData, DynamoDBItem[]>;
 }
 
 /**
diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.state.ts b/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.state.ts
index c2565910f63352fbac8c46b2cdef1811c47eb41b..73a541f0a42aa9e0f15c887ae817fececae5883c 100644
--- a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.state.ts
+++ b/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.state.ts
@@ -2,7 +2,7 @@ import {DynamoDBItem} from '@ghsc/nshmp-utils-ts/libs/aws/run-nshmp-haz';
 import {TerminateJobState} from 'projects/nshmp-apps/src/shared/state/aws';
 
 /**
- * Application NGRX state.
+ * Application state.
  */
 export type AppState = TerminateJobState<DynamoDBItem>;