diff --git a/package.json b/package.json
index 8ee76ed0e..38083c0ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "7.0.64-srt-16-september-24",
+  "version": "7.0.64-srt-17-september-24",
   "engines": {
     "node": ">=18.19.0"
   },
diff --git a/projects/ccd-case-ui-toolkit/package.json b/projects/ccd-case-ui-toolkit/package.json
index e8d87d7fb..25208346f 100644
--- a/projects/ccd-case-ui-toolkit/package.json
+++ b/projects/ccd-case-ui-toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "7.0.64-srt-16-september-24",
+  "version": "7.0.64-srt-17-september-24",
   "engines": {
     "node": ">=18.19.0"
   },
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit/case-edit.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit/case-edit.component.spec.ts
index 25bf11aa6..996866976 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit/case-edit.component.spec.ts
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit/case-edit.component.spec.ts
@@ -1206,7 +1206,7 @@ describe('CaseEditComponent', () => {
         expect(validPageListCaseFieldsService.validPageListCaseFields).toHaveBeenCalled();
         expect(formValueService.removeUnnecessaryFields).toHaveBeenCalled();
         // check that tasks removed from session storage once event has been completed
-        expect(mockSessionStorageService.removeItem).toHaveBeenCalledWith('taskToComplete');
+        expect(mockSessionStorageService.removeItem).toHaveBeenCalledWith('clientContext');
         expect(mockSessionStorageService.removeItem).toHaveBeenCalledWith('taskEventCompletionInfo');
       });
 
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit/case-edit.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit/case-edit.component.ts
index ea4584c82..343d17f57 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit/case-edit.component.ts
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-edit/case-edit.component.ts
@@ -455,8 +455,8 @@ export class CaseEditComponent implements OnInit, OnDestroy {
       return this.postCompleteTaskIfRequired();
     }),finalize(() => {
         this.loadingService.unregister(loadingSpinnerToken);
-        // on event completion ensure the previous event taskToComplete/taskEventCompletionInfo removed
-        this.sessionStorageService.removeItem('taskToComplete');
+        // on event completion ensure the previous event clientContext/taskEventCompletionInfo removed
+        this.sessionStorageService.removeItem('clientContext');
         this.sessionStorageService.removeItem('taskEventCompletionInfo')
         this.isSubmitting = false;
       }))
@@ -526,7 +526,7 @@ export class CaseEditComponent implements OnInit, OnDestroy {
     }
   }
 
-  // checks whether current taskToComplete relevant for the event
+  // checks whether current clientContext relevant for the event
   public taskExistsForThisEvent(taskInSessionStorage: Task, taskEventCompletionInfo: TaskEventCompletionInfo, eventDetails: EventDetails): boolean {
     if (!taskInSessionStorage || taskInSessionStorage.case_id !== eventDetails.caseId) {
       return false;
@@ -542,7 +542,7 @@ export class CaseEditComponent implements OnInit, OnDestroy {
         || this.eventMoreThanDayAgo(taskEventCompletionInfo.createdTimestamp)
       ) {
         // if the session storage not related to event, ignore it and remove
-        this.sessionStorageService.removeItem('taskToComplete');
+        this.sessionStorageService.removeItem('clientContext');
         this.sessionStorageService.removeItem('taskEventCompletionInfo');
         return false;
       }
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-cancelled/case-event-completion-task-cancelled.component.spec.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-cancelled/case-event-completion-task-cancelled.component.spec.ts
index ad4db010a..c2c6a76ca 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-cancelled/case-event-completion-task-cancelled.component.spec.ts
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-cancelled/case-event-completion-task-cancelled.component.spec.ts
@@ -32,7 +32,7 @@ describe('TaskCancelledComponent', () => {
     fixture = TestBed.createComponent(WrapperComponent);
     wrapper = fixture.componentInstance;
     component = fixture.componentInstance.appComponentRef;
-    const sessionStorageSpy = jasmine.createSpyObj('mockSessionStorageService', ['removeItem'])
+    const sessionStorageSpy = jasmine.createSpyObj('mockSessionStorageService', ['removeItem']);
     wrapper.context = {caseId: '123456789', sessionStorageService: sessionStorageSpy} as EventCompletionStateMachineContext;
     fixture.detectChanges();
   });
@@ -46,7 +46,7 @@ describe('TaskCancelledComponent', () => {
   it('should emit event can be completed true when clicked on continue button', () => {
     spyOn(component.notifyEventCompletionCancelled, 'emit');
     component.onContinue();
-    expect(component.context.sessionStorageService.removeItem).toHaveBeenCalledWith('taskToComplete')
+    expect(component.context.sessionStorageService.removeItem).toHaveBeenCalledWith('clientContext')
     expect(component.notifyEventCompletionCancelled.emit).toHaveBeenCalledWith(true);
   });
 
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-cancelled/case-event-completion-task-cancelled.component.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-cancelled/case-event-completion-task-cancelled.component.ts
index 629ddaa8d..c2f5840db 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-cancelled/case-event-completion-task-cancelled.component.ts
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-cancelled/case-event-completion-task-cancelled.component.ts
@@ -20,7 +20,7 @@ export class CaseEventCompletionTaskCancelledComponent implements OnInit {
 
   public onContinue(): void {
     // Removes task to complete so event completes without task
-    this.context.sessionStorageService.removeItem('taskToComplete');
+    this.context.sessionStorageService.removeItem('clientContext');
     // may be able to remove this call below since it is now unneccesary
     this.notifyEventCompletionCancelled.emit(true);
   }
diff --git a/projects/ccd-case-ui-toolkit/src/lib/shared/components/event-start/services/event-start-state-machine.service.ts b/projects/ccd-case-ui-toolkit/src/lib/shared/components/event-start/services/event-start-state-machine.service.ts
index b512841b0..8ab746f4b 100644
--- a/projects/ccd-case-ui-toolkit/src/lib/shared/components/event-start/services/event-start-state-machine.service.ts
+++ b/projects/ccd-case-ui-toolkit/src/lib/shared/components/event-start/services/event-start-state-machine.service.ts
@@ -201,7 +201,6 @@ export class EventStartStateMachineService {
     if (userInfoStr) {
       userInfo = JSON.parse(userInfoStr);
     }
-    console.log('entryActionForStateOneTaskAssignedToUser: setting taskToComplete to ' + taskStr);
     // Store task to session
     const taskEventCompletionInfo: TaskEventCompletionInfo = {
       caseId: context.caseId,