diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
index 24cd5fc763344f824880aa97d2a3c97872750478..3fad4144d7854c4df02e4c5fd74c9f03db3d4b79 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
@@ -10,15 +10,15 @@
   <mat-tab
     labelClass="medians-tab"
     label="Medians"
-    [disabled]="(hasData$ | async) === false"
+    [disabled]="hasData() === false"
   >
     <ng-template matTabContent>
-      <nshmp-lib-ng-export-data-table
-        [table]="table$ | async"
+      <nshmp-lib-no-ngrx-export-data-table
+        [table]="table()"
         filename="hanging-wall-effects.csv"
         buttonText="Export to CSV"
       />
-      <nshmp-lib-ng-data-table [table]="table$ | async" />
+      <nshmp-lib-no-ngrx-data-table [table]="table()" />
     </ng-template>
   </mat-tab>
 </mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.ts b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.ts
index 6178e6285ca3a0f12ebc78dd2d62d1df9aa54e94..8d7f1307434cdf356dff7a8ba441aedac4ab0aaf 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.ts
+++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.ts
@@ -1,12 +1,11 @@
 import {AsyncPipe} from '@angular/common';
-import {Component} from '@angular/core';
+import {Component, computed} from '@angular/core';
 import {MatTab, MatTabContent, MatTabGroup} from '@angular/material/tabs';
-import {gmmUtils} from '@ghsc/nshmp-lib-ng/gmm';
+import {gmmUtils} from '@ghsc/nshmp-lib-no-ngrx/gmm';
 import {
   NshmpLibNgDataTableComponent,
   NshmpLibNgExportDataTableComponent,
-} from '@ghsc/nshmp-lib-ng/nshmp';
-import {map} from 'rxjs';
+} from '@ghsc/nshmp-lib-no-ngrx/nshmp';
 
 import {AppFacade} from '../../state/app.facade';
 import {Plots} from '../../state/app.state';
@@ -34,18 +33,14 @@ export class ContentComponent {
   exp = true;
 
   /** Whether service has been called and data exists */
-  hasData$ = this.facade.serviceResponses$.pipe(
-    map(responses => responses?.length > 0)
-  );
+  hasData = computed(() => this.facade.state().serviceResponses?.length > 0);
 
   /** Table data for table */
-  table$ = this.facade.plots$.pipe(
-    map(plots =>
-      gmmUtils.plotToTable(
-        plots.get(Plots.GROUND_MOTION).plotData,
-        this.exp,
-        this.commonXValues
-      )
+  table = computed(() =>
+    gmmUtils.plotToTable(
+      this.facade.state().plots.get(Plots.GROUND_MOTION).plotData,
+      this.exp,
+      this.commonXValues
     )
   );