diff --git a/packages/data-store/src/eventLogger/EventLoggerStore.ts b/packages/data-store/src/eventLogger/EventLoggerStore.ts
index df2edb882..db23c671e 100644
--- a/packages/data-store/src/eventLogger/EventLoggerStore.ts
+++ b/packages/data-store/src/eventLogger/EventLoggerStore.ts
@@ -48,12 +48,12 @@ export class EventLoggerStore extends AbstractEventLoggerStore {
       actionSubType: event.actionSubType,
       initiatorType: event.initiatorType,
       partyAlias: event.partyAlias,
-      partyCorrelationId: event.partyCorrelationId, // TODO or map contact
+      partyCorrelationId: event.partyCorrelationId,
       partyCorrelationType: event.partyCorrelationType,
       subSystemType: event.subSystemType,
       system: event.system,
       systemAlias: event.systemAlias,
-      systemCorrelationId: event.systemCorrelationId, // TODO or map contact
+      systemCorrelationId: event.systemCorrelationId,
       systemCorrelationIdType: event.systemCorrelationIdType,
       ...(event.data && {data: JSON.parse(event.data)}),
       ...(event.diagnosticData && {diagnosticData: JSON.parse(event.diagnosticData)}),
diff --git a/packages/ssi-sdk-core/src/types/events.ts b/packages/ssi-sdk-core/src/types/events.ts
index da40c7996..54cf900a3 100644
--- a/packages/ssi-sdk-core/src/types/events.ts
+++ b/packages/ssi-sdk-core/src/types/events.ts
@@ -69,7 +69,7 @@ export enum SystemCorrelationIdType {
   USER = 'user'
 }
 
-export enum PartyCorrelationType { // TODO we already have SystemCorrelationIdType, should these be duplicated?
+export enum PartyCorrelationType {
   DID = 'did',
   EMAIL = 'email',
   HOSTNAME = 'hostname',