diff --git a/src/app/features/home/capture-tab/capture-details/capture-details.page.ts b/src/app/features/home/capture-tab/capture-details/capture-details.page.ts
index ba51de1b7..698f4c937 100644
--- a/src/app/features/home/capture-tab/capture-details/capture-details.page.ts
+++ b/src/app/features/home/capture-tab/capture-details/capture-details.page.ts
@@ -4,7 +4,15 @@ import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TranslocoService } from '@ngneat/transloco';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { concatMap, map, shareReplay, switchMap, tap } from 'rxjs/operators';
+import { defer } from 'rxjs';
+import {
+  concatMap,
+  concatMapTo,
+  map,
+  shareReplay,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
 import { BlockingActionService } from '../../../../shared/services/blocking-action/blocking-action.service';
 import { ConfirmAlert } from '../../../../shared/services/confirm-alert/confirm-alert.service';
 import { DiaBackendAuthService } from '../../../../shared/services/dia-backend/auth/dia-backend-auth.service';
@@ -96,7 +104,8 @@ export class CaptureDetailsPage {
 
   private async remove() {
     const action$ = this.proof$.pipe(
-      concatMap(proof => this.proofRepository.remove(proof))
+      concatMap(proof => this.proofRepository.remove(proof)),
+      concatMapTo(defer(() => this.router.navigate(['..'])))
     );
     const result = await this.confirmAlert.present();
     if (result) {
diff --git a/src/app/features/home/capture-tab/capture-item/capture-item.component.html b/src/app/features/home/capture-tab/capture-item/capture-item.component.html
new file mode 100644
index 000000000..b72448ec5
--- /dev/null
+++ b/src/app/features/home/capture-tab/capture-item/capture-item.component.html
@@ -0,0 +1,11 @@
+<div *ngIf="willCollectTruth$ | async" class="spinner-container">
+  <ion-spinner></ion-spinner>
+</div>
+<ion-icon *ngIf="willCollectTruth$ | async" name="hourglass-outline"></ion-icon>
+<!-- Display an empty small image to avoid border of img without src. -->
+<img
+  [src]="
+    (thumbnailUrl$ | async) ||
+    'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='
+  "
+/>
diff --git a/src/app/features/home/capture-tab/capture-item/capture-item.component.scss b/src/app/features/home/capture-tab/capture-item/capture-item.component.scss
new file mode 100644
index 000000000..fc66c5c56
--- /dev/null
+++ b/src/app/features/home/capture-tab/capture-item/capture-item.component.scss
@@ -0,0 +1,46 @@
+:host {
+  display: block;
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  border-radius: 4px;
+  background-color: whitesmoke;
+}
+
+ion-icon {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin-right: -50%;
+  transform: translate(-50%, -50%);
+  z-index: 10;
+  opacity: 50%;
+  font-size: 24px;
+  color: white;
+}
+
+.spinner-container {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin-right: -50%;
+  transform: translate(-50%, -50%);
+  z-index: 9;
+
+  ion-spinner {
+    width: 48px;
+    height: 48px;
+    opacity: 50%;
+
+    --color: white;
+  }
+}
+
+img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  object-position: center;
+  background-color: whitesmoke;
+}
diff --git a/src/app/features/home/capture-tab/capture-item/capture-item.component.spec.ts b/src/app/features/home/capture-tab/capture-item/capture-item.component.spec.ts
new file mode 100644
index 000000000..17af03712
--- /dev/null
+++ b/src/app/features/home/capture-tab/capture-item/capture-item.component.spec.ts
@@ -0,0 +1,23 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { SharedTestingModule } from '../../../../shared/shared-testing.module';
+import { CaptureItemComponent } from './capture-item.component';
+
+describe('CaptureItemComponent', () => {
+  let component: CaptureItemComponent;
+  let fixture: ComponentFixture<CaptureItemComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [CaptureItemComponent],
+      imports: [SharedTestingModule],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CaptureItemComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/features/home/capture-tab/capture-item/capture-item.component.ts b/src/app/features/home/capture-tab/capture-item/capture-item.component.ts
new file mode 100644
index 000000000..2608ba4f2
--- /dev/null
+++ b/src/app/features/home/capture-tab/capture-item/capture-item.component.ts
@@ -0,0 +1,63 @@
+import { Component, Input } from '@angular/core';
+import { UntilDestroy } from '@ngneat/until-destroy';
+import { BehaviorSubject } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { getOldProof } from '../../../../shared/services/repositories/proof/old-proof-adapter';
+import { Proof } from '../../../../shared/services/repositories/proof/proof';
+import { isNonNullable } from '../../../../utils/rx-operators/rx-operators';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+  selector: 'app-capture-item',
+  templateUrl: './capture-item.component.html',
+  styleUrls: ['./capture-item.component.scss'],
+})
+export class CaptureItemComponent {
+  // Use setter to make sure the item is updated even if the component is
+  // recycled and redrawed (e.g. virtual scroll).
+  @Input()
+  set item(value: CaptureItem) {
+    this._item$.next(value);
+  }
+
+  // tslint:disable-next-line: rxjs-no-explicit-generics
+  private readonly _item$ = new BehaviorSubject<CaptureItem | undefined>(
+    undefined
+  );
+  readonly item$ = this._item$.asObservable().pipe(isNonNullable());
+  readonly thumbnailUrl$ = this.item$.pipe(
+    switchMap(item => item.getThumbnailUrl())
+  );
+  readonly willCollectTruth$ = this.item$.pipe(
+    map(item => item.proof?.willCollectTruth === true)
+  );
+}
+
+export class CaptureItem {
+  proof?: Proof;
+  private readonly createdTimestamp: number;
+
+  get oldProofHash() {
+    if (this.proof) {
+      return getOldProof(this.proof).hash;
+    }
+  }
+
+  get timestamp() {
+    if (this.proof) {
+      return this.proof.timestamp;
+    }
+    return this.createdTimestamp;
+  }
+
+  constructor({ proof }: { proof?: Proof }) {
+    this.proof = proof;
+    this.createdTimestamp = Date.now();
+  }
+
+  async getThumbnailUrl() {
+    if (this.proof) {
+      return this.proof.getThumbnailUrl();
+    }
+  }
+}
diff --git a/src/app/features/home/capture-tab/capture-tab.component.html b/src/app/features/home/capture-tab/capture-tab.component.html
index 656ce31c0..092c4b0d1 100644
--- a/src/app/features/home/capture-tab/capture-tab.component.html
+++ b/src/app/features/home/capture-tab/capture-tab.component.html
@@ -1,25 +1,20 @@
 <ng-container
-  *ngFor="let group of capturesByDate$ | async | keyvalue: keyDescendingOrder"
+  *ngFor="
+    let group of capturesByDate$ | async | keyvalue: keyDescendingOrder;
+    trackBy: trackCaptureGroupByDate
+  "
 >
   <div class="mat-title">{{ group.key }}</div>
   <mat-grid-list cols="3" gutterSize="8px">
     <mat-grid-tile
-      *ngFor="let capture of group.value"
+      *ngFor="let captureItem of group.value; trackBy: trackCaptureItem"
       [routerLink]="
-        capture.proof.willCollectTruth
+        captureItem.proof.willCollectTruth
           ? undefined
-          : ['capture-details', { oldProofHash: capture.oldProofHash }]
+          : ['capture-details', { oldProofHash: captureItem.oldProofHash }]
       "
-      class="capture-item"
     >
-      <div *ngIf="capture.proof.willCollectTruth" class="spinner-container">
-        <ion-spinner></ion-spinner>
-      </div>
-      <ion-icon
-        *ngIf="capture.proof.willCollectTruth"
-        name="hourglass-outline"
-      ></ion-icon>
-      <img [src]="capture.thumbnailUrl" />
+      <app-capture-item [item]="captureItem"></app-capture-item>
     </mat-grid-tile>
   </mat-grid-list>
 </ng-container>
diff --git a/src/app/features/home/capture-tab/capture-tab.component.scss b/src/app/features/home/capture-tab/capture-tab.component.scss
index c327d6a3c..f803369be 100644
--- a/src/app/features/home/capture-tab/capture-tab.component.scss
+++ b/src/app/features/home/capture-tab/capture-tab.component.scss
@@ -9,46 +9,3 @@ div.mat-title {
   margin: 26px 0 0;
   font-size: large;
 }
-
-.capture-item {
-  height: 30vw;
-  overflow: hidden;
-  object-fit: cover;
-  border-radius: 4px;
-
-  .spinner-container {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    margin-right: -50%;
-    transform: translate(-50%, -50%);
-    z-index: 9;
-
-    ion-spinner {
-      width: 48px;
-      height: 48px;
-      opacity: 50%;
-
-      --color: white;
-    }
-  }
-
-  ion-icon {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    margin-right: -50%;
-    transform: translate(-50%, -50%);
-    z-index: 10;
-    opacity: 30%;
-    color: white;
-    font-size: 24px;
-  }
-
-  img {
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-    object-position: inherit;
-  }
-}
diff --git a/src/app/features/home/capture-tab/capture-tab.component.ts b/src/app/features/home/capture-tab/capture-tab.component.ts
index 2f093fa7f..dd548c245 100644
--- a/src/app/features/home/capture-tab/capture-tab.component.ts
+++ b/src/app/features/home/capture-tab/capture-tab.component.ts
@@ -2,8 +2,8 @@ import { formatDate, KeyValue } from '@angular/common';
 import { Component } from '@angular/core';
 import { groupBy } from 'lodash';
 import { concatMap, map } from 'rxjs/operators';
-import { getOldProof } from '../../../shared/services/repositories/proof/old-proof-adapter';
 import { ProofRepository } from '../../../shared/services/repositories/proof/proof-repository.service';
+import { CaptureItem } from './capture-item/capture-item.component';
 
 @Component({
   selector: 'app-capture-tab',
@@ -15,17 +15,11 @@ export class CaptureTabComponent {
   readonly capturesByDate$ = this.proofs$.pipe(
     map(proofs => proofs.sort((a, b) => b.timestamp - a.timestamp)),
     concatMap(proofs =>
-      Promise.all(
-        proofs.map(async proof => ({
-          proof,
-          thumbnailUrl: await proof.getThumbnailUrl(),
-          oldProofHash: getOldProof(proof).hash,
-        }))
-      )
+      Promise.all(proofs.map(async proof => new CaptureItem({ proof })))
     ),
-    map(captures =>
-      groupBy(captures, capture =>
-        formatDate(capture.proof.timestamp, 'yyyy/MM/dd', 'en-US')
+    map(captureItems =>
+      groupBy(captureItems, item =>
+        formatDate(item.timestamp, 'yyyy/MM/dd', 'en-US')
       )
     )
   );
@@ -39,4 +33,17 @@ export class CaptureTabComponent {
   ): number {
     return a.key > b.key ? -1 : b.key > a.key ? 1 : 0;
   }
+
+  // tslint:disable-next-line: prefer-function-over-method
+  trackCaptureGroupByDate(
+    _: number,
+    item: { key: string; value: CaptureItem[] }
+  ) {
+    return item.key;
+  }
+
+  // tslint:disable-next-line: prefer-function-over-method
+  trackCaptureItem(_: number, item: CaptureItem) {
+    return item.oldProofHash;
+  }
 }
diff --git a/src/app/features/home/home.module.ts b/src/app/features/home/home.module.ts
index 35b2d91dc..1df576792 100644
--- a/src/app/features/home/home.module.ts
+++ b/src/app/features/home/home.module.ts
@@ -1,12 +1,13 @@
 import { NgModule } from '@angular/core';
 import { PostCaptureCardModule } from '../../shared/core/post-capture-card/post-capture-card.module';
 import { SharedModule } from '../../shared/shared.module';
+import { CaptureItemComponent } from './capture-tab/capture-item/capture-item.component';
 import { CaptureTabComponent } from './capture-tab/capture-tab.component';
 import { HomePageRoutingModule } from './home-routing.module';
 import { HomePage } from './home.page';
 
 @NgModule({
   imports: [SharedModule, HomePageRoutingModule, PostCaptureCardModule],
-  declarations: [HomePage, CaptureTabComponent],
+  declarations: [HomePage, CaptureTabComponent, CaptureItemComponent],
 })
 export class HomePageModule {}
diff --git a/src/app/features/home/inbox/inbox.page.html b/src/app/features/home/inbox/inbox.page.html
index a28d493d4..11004f5a0 100644
--- a/src/app/features/home/inbox/inbox.page.html
+++ b/src/app/features/home/inbox/inbox.page.html
@@ -6,10 +6,6 @@
 </mat-toolbar>
 
 <div *transloco="let t" class="page-content">
-  <mat-spinner
-    *ngIf="(receivedTransactions$ | async)?.length === 0 && isFetching$ | async"
-    diameter="36"
-  ></mat-spinner>
   <span
     *ngIf="
       (receivedTransactions$ | async)?.length === 0 &&
diff --git a/src/app/features/home/transaction/transaction.page.html b/src/app/features/home/transaction/transaction.page.html
index 9ed98bec4..85925e91f 100644
--- a/src/app/features/home/transaction/transaction.page.html
+++ b/src/app/features/home/transaction/transaction.page.html
@@ -6,12 +6,6 @@
 </mat-toolbar>
 
 <div *transloco="let t" class="page-content">
-  <mat-spinner
-    *ngIf="
-      (transactionsWithStatus$ | async)?.length === 0 && isFetching$ | async
-    "
-    diameter="36"
-  ></mat-spinner>
   <mat-list>
     <ng-container
       *ngFor="
diff --git a/src/app/shared/services/collector/collector.service.ts b/src/app/shared/services/collector/collector.service.ts
index a6c2219ec..662f7bf9b 100644
--- a/src/app/shared/services/collector/collector.service.ts
+++ b/src/app/shared/services/collector/collector.service.ts
@@ -1,8 +1,5 @@
 import { Injectable } from '@angular/core';
-import { TranslocoService } from '@ngneat/transloco';
-import { defer } from 'rxjs';
 import { ImageStore } from '../image-store/image-store.service';
-import { NotificationService } from '../notification/notification.service';
 import {
   Assets,
   getSerializedSortedSignedTargets,
@@ -11,7 +8,6 @@ import {
   SignedTargets,
   Truth,
 } from '../repositories/proof/proof';
-import { ProofRepository } from '../repositories/proof/proof-repository.service';
 import { FactsProvider } from './facts/facts-provider';
 import { SignatureProvider } from './signature/signature-provider';
 
@@ -22,23 +18,9 @@ export class CollectorService {
   private readonly factsProviders = new Set<FactsProvider>();
   private readonly signatureProviders = new Set<SignatureProvider>();
 
-  constructor(
-    private readonly notificationService: NotificationService,
-    private readonly translocoService: TranslocoService,
-    private readonly proofRepository: ProofRepository,
-    private readonly imageStore: ImageStore
-  ) {}
+  constructor(private readonly imageStore: ImageStore) {}
 
   async run(assets: Assets) {
-    return this.notificationService.notifyOnGoing(
-      defer(() => this._run(assets)),
-      this.translocoService.translate('storingAssets'),
-      this.translocoService.translate('message.storingAssets'),
-      true
-    );
-  }
-
-  private async _run(assets: Assets) {
     const truth = await this.collectTruth(assets);
     const signatures = await this.signTargets({ assets, truth });
     return Proof.from(this.imageStore, assets, truth, signatures);
diff --git a/src/app/shared/services/database/table/capacitor-filesystem-table/capacitor-filesystem-table.ts b/src/app/shared/services/database/table/capacitor-filesystem-table/capacitor-filesystem-table.ts
index 28974eb63..2cfc17057 100644
--- a/src/app/shared/services/database/table/capacitor-filesystem-table/capacitor-filesystem-table.ts
+++ b/src/app/shared/services/database/table/capacitor-filesystem-table/capacitor-filesystem-table.ts
@@ -136,14 +136,16 @@ export class CapacitorFilesystemTable<T extends Tuple> implements Table<T> {
   }
 
   async update(newTuple: T, comparator: (x: T, y: T) => boolean) {
-    const afterDeletion = differenceWith(
-      this.tuples$.value,
-      [newTuple],
-      comparator
-    );
-    this.tuples$.next(afterDeletion.concat(newTuple));
-    await this.dumpJson();
-    return newTuple;
+    return this.mutex.runExclusive(async () => {
+      const afterDeletion = differenceWith(
+        this.tuples$.value,
+        [newTuple],
+        comparator
+      );
+      this.tuples$.next(afterDeletion.concat(newTuple));
+      await this.dumpJson();
+      return newTuple;
+    });
   }
 
   private assertTuplesExist(tuples: T[], comparator: (x: T, y: T) => boolean) {
diff --git a/src/app/shared/services/dia-backend/asset/dia-backend-asset-repository.service.ts b/src/app/shared/services/dia-backend/asset/dia-backend-asset-repository.service.ts
index 1f1a7409c..cdee561ad 100644
--- a/src/app/shared/services/dia-backend/asset/dia-backend-asset-repository.service.ts
+++ b/src/app/shared/services/dia-backend/asset/dia-backend-asset-repository.service.ts
@@ -68,15 +68,7 @@ export class DiaBackendAssetRepository {
     );
   }
 
-  async add(proof: Proof) {
-    return this.notificationService.notifyOnGoing(
-      this.createAsset$(proof),
-      this.translocoService.translate('registeringProof'),
-      this.translocoService.translate('message.registeringProof')
-    );
-  }
-
-  private createAsset$(proof: Proof) {
+  add$(proof: Proof) {
     return forkJoin([
       defer(() => this.authService.getAuthHeaders()),
       defer(() => buildFormDataToCreateAsset(proof)),
diff --git a/src/app/shared/services/notification/notification-item.spec.ts b/src/app/shared/services/notification/notification-item.spec.ts
index f85141473..97f498bc2 100644
--- a/src/app/shared/services/notification/notification-item.spec.ts
+++ b/src/app/shared/services/notification/notification-item.spec.ts
@@ -3,7 +3,6 @@
 import { TestBed } from '@angular/core/testing';
 import { LocalNotificationsPlugin, Plugins } from '@capacitor/core';
 import { TranslocoService } from '@ngneat/transloco';
-import { of, throwError } from 'rxjs';
 import { LOCAL_NOTIFICATIONS_PLUGIN } from '../../../shared/core/capacitor-plugins/capacitor-plugins.module';
 import { SharedTestingModule } from '../../../shared/shared-testing.module';
 import { NotificationItem } from './notification-item';
@@ -35,47 +34,6 @@ describe('NotificationItem', () => {
       NotificationItem
     );
   });
-
-  it('should be able to notify error', async () => {
-    spyOn(console, 'error');
-    expect(await item.error(SAMPLE_ERROR)).toBeInstanceOf(Error);
-  });
-
-  it('should be able to cancel itself', async () => {
-    spyOn(console, 'log');
-    expect(await item.cancel()).toBeInstanceOf(NotificationItem);
-  });
-
-  it('should be able to notify with on going action and cancel automatically', async () => {
-    spyOn(console, 'info');
-    spyOn(localNotificationsPlugin, 'cancel').and.resolveTo();
-    const expected = 2;
-    const result = await item.notifyOnGoing(
-      of(1, expected),
-      SAMPLE_TITLE,
-      SAMPLE_MESSAGE
-    );
-    expect(localNotificationsPlugin.cancel).toHaveBeenCalled();
-    expect(result).toEqual(expected);
-  });
-
-  it('should return an Error and do not cancel automatically when throw during on going action', async () => {
-    const expected = SAMPLE_ERROR;
-    spyOn(console, 'info');
-    spyOn(localNotificationsPlugin, 'cancel').and.resolveTo();
-    spyOn(item, 'error').and.resolveTo(expected);
-    try {
-      await item.notifyOnGoing(
-        throwError(expected),
-        SAMPLE_TITLE,
-        SAMPLE_MESSAGE
-      );
-    } catch (err) {
-      expect(err).toEqual(expected);
-    }
-    expect(localNotificationsPlugin.cancel).not.toHaveBeenCalled();
-    expect(item.error).toHaveBeenCalled();
-  });
 });
 
 const SAMPLE_TITLE = 'SAMPLE_TITLE';
diff --git a/src/app/shared/services/notification/notification-item.ts b/src/app/shared/services/notification/notification-item.ts
index 8f54c4b1d..0f6773c10 100644
--- a/src/app/shared/services/notification/notification-item.ts
+++ b/src/app/shared/services/notification/notification-item.ts
@@ -1,8 +1,6 @@
 import { Inject } from '@angular/core';
 import { LocalNotification, LocalNotificationsPlugin } from '@capacitor/core';
 import { TranslocoService } from '@ngneat/transloco';
-import { Observable } from 'rxjs';
-import { last } from 'rxjs/operators';
 import { LOCAL_NOTIFICATIONS_PLUGIN } from '../../../shared/core/capacitor-plugins/capacitor-plugins.module';
 
 export class NotificationItem {
@@ -18,51 +16,6 @@ export class NotificationItem {
     return this.schedule({ id: this.id, title, body });
   }
 
-  async error(error: Error) {
-    console.error(error);
-    await this.schedule({
-      id: this.id,
-      title: this.translocoService.translate('unknownError'),
-      body: JSON.stringify(error),
-      ongoing: false,
-    });
-    return error;
-  }
-
-  async cancel() {
-    this.localNotificationsPlugin.cancel({
-      notifications: [{ id: String(this.id) }],
-    });
-    return this;
-  }
-
-  async notifyOnGoing<T>(
-    action$: Observable<T>,
-    title: string,
-    body: string,
-    swipable = false
-  ) {
-    console.info(`${title}: ${body}`);
-    const notification = await this.schedule({
-      id: this.id,
-      title,
-      body,
-      ongoing: !swipable,
-    });
-    return new Promise<T>((resolve, reject) => {
-      action$.pipe(last()).subscribe({
-        next(value) {
-          notification.cancel();
-          resolve(value);
-        },
-        error(err) {
-          notification.error(err);
-          reject(err);
-        },
-      });
-    });
-  }
-
   private async schedule(options: LocalNotification) {
     await this.localNotificationsPlugin.schedule({
       notifications: [options],
diff --git a/src/app/shared/services/notification/notification.service.spec.ts b/src/app/shared/services/notification/notification.service.spec.ts
index e7c203582..aa449502b 100644
--- a/src/app/shared/services/notification/notification.service.spec.ts
+++ b/src/app/shared/services/notification/notification.service.spec.ts
@@ -2,7 +2,6 @@
 
 import { TestBed } from '@angular/core/testing';
 import { LocalNotificationsPlugin, Plugins } from '@capacitor/core';
-import { of, throwError } from 'rxjs';
 import { LOCAL_NOTIFICATIONS_PLUGIN } from '../../../shared/core/capacitor-plugins/capacitor-plugins.module';
 import { SharedTestingModule } from '../../../shared/shared-testing.module';
 import { NotificationItem } from './notification-item';
@@ -36,41 +35,6 @@ describe('NotificationService', () => {
       NotificationItem
     );
   });
-
-  it('should be able to notify error', async () => {
-    spyOn(console, 'error');
-    expect(await service.error(SAMPLE_ERROR)).toBeInstanceOf(Error);
-  });
-
-  it('should be able to notify with on going action and cancel automatically', async () => {
-    spyOn(console, 'info');
-    spyOn(localNotificationsPlugin, 'cancel').and.resolveTo();
-    const expected = 2;
-    const result = await service.notifyOnGoing(
-      of(1, expected),
-      SAMPLE_TITLE,
-      SAMPLE_MESSAGE
-    );
-    expect(localNotificationsPlugin.cancel).toHaveBeenCalled();
-    expect(result).toEqual(expected);
-  });
-
-  it('should return an Error and do not cancel automatically when throw during on going action', async () => {
-    spyOn(console, 'info');
-    spyOn(console, 'error');
-    const expected = SAMPLE_ERROR;
-    spyOn(localNotificationsPlugin, 'cancel').and.resolveTo();
-    try {
-      await service.notifyOnGoing(
-        throwError(expected),
-        SAMPLE_TITLE,
-        SAMPLE_MESSAGE
-      );
-    } catch (err) {
-      expect(err).toEqual(expected);
-    }
-    expect(localNotificationsPlugin.cancel).not.toHaveBeenCalled();
-  });
 });
 
 const SAMPLE_TITLE = 'SAMPLE_TITLE';
diff --git a/src/app/shared/services/notification/notification.service.ts b/src/app/shared/services/notification/notification.service.ts
index 40a356040..d569e0fe0 100644
--- a/src/app/shared/services/notification/notification.service.ts
+++ b/src/app/shared/services/notification/notification.service.ts
@@ -1,7 +1,6 @@
 import { Inject, Injectable } from '@angular/core';
 import { LocalNotificationsPlugin } from '@capacitor/core';
 import { TranslocoService } from '@ngneat/transloco';
-import { Observable } from 'rxjs';
 import { LOCAL_NOTIFICATIONS_PLUGIN } from '../../../shared/core/capacitor-plugins/capacitor-plugins.module';
 import { NotificationItem } from './notification-item';
 
@@ -37,22 +36,4 @@ export class NotificationService {
   async notify(title: string, body: string) {
     return this.createNotification().notify(title, body);
   }
-
-  async error(error: Error) {
-    return this.createNotification().error(error);
-  }
-
-  async notifyOnGoing<T>(
-    action$: Observable<T>,
-    title: string,
-    body: string,
-    swipable = false
-  ) {
-    return this.createNotification().notifyOnGoing(
-      action$,
-      title,
-      body,
-      swipable
-    );
-  }
 }
diff --git a/src/assets/i18n/en-us.json b/src/assets/i18n/en-us.json
index e29a4bb96..5a66d2681 100644
--- a/src/assets/i18n/en-us.json
+++ b/src/assets/i18n/en-us.json
@@ -23,8 +23,6 @@
   "emptyInbox": "Empty Inbox",
   "editCaption": "Edit Caption",
   "selectAPublisher": "Select a Publisher",
-  "registeringProof": "Registering Asset",
-  "storingAssets": "Storing Capture",
   "about": "About",
   "version": "Version",
   "informationProvider": "Information Provider",
@@ -97,8 +95,6 @@
     "accountNotActivated": "This account has not been activated yet.",
     "ifYouNotReceiveEmail": "If you haven't received the verification email in 10 minutes, you can click the button below to resend the verification email.",
     "tooManyRetries": "You have entered the invalid email or password too many times. Please try again later.",
-    "storingAssets": "Collecting environment variables, signing and storing assets...",
-    "registeringProof": "Registering the asset to Numbers DIA.",
     "forbiddenAllNumeric": "Cannot contain only numbers.",
     "isNotEmail": "Does not follow email format.",
     "pleaseWait": "Please wait...",
diff --git a/src/assets/i18n/zh-tw.json b/src/assets/i18n/zh-tw.json
index ff7538d80..d5d0e4816 100644
--- a/src/assets/i18n/zh-tw.json
+++ b/src/assets/i18n/zh-tw.json
@@ -23,8 +23,6 @@
   "emptyInbox": "空收件匣",
   "editCaption": "編輯標題",
   "selectAPublisher": "選擇發佈者",
-  "registeringProof": "正在發佈拍攝",
-  "storingAssets": "正在儲存拍攝",
   "about": "關於",
   "version": "版本",
   "informationProvider": "資訊提供者",
@@ -97,8 +95,6 @@
     "accountNotActivated": "此帳戶尚未啟用。",
     "ifYouNotReceiveEmail": "如果您在10分鐘內仍未收到驗證電子郵件，請單擊下面的按鈕重新發送驗證電子郵件。",
     "tooManyRetries": "您輸入無效的電子郵件或密碼的次數過多。請稍後再試。",
-    "storingAssets": "正在蒐集環境資料、簽章並保存拍攝...",
-    "registeringProof": "正在將影像資產註冊至 Numbers DIA。",
     "forbiddenAllNumeric": "密碼不能只有數字。",
     "isNotEmail": "電子郵件格式不符。",
     "pleaseWait": "請稍候...",