diff --git a/src/modules/cards/tests/application/AddUrlToLibraryUseCase.test.ts b/src/modules/cards/tests/application/AddUrlToLibraryUseCase.test.ts
index ecd4ab24..a1afceb3 100644
--- a/src/modules/cards/tests/application/AddUrlToLibraryUseCase.test.ts
+++ b/src/modules/cards/tests/application/AddUrlToLibraryUseCase.test.ts
@@ -9,6 +9,7 @@ import { CardCollectionService } from '../../domain/services/CardCollectionServi
 import { CuratorId } from '../../domain/value-objects/CuratorId';
 import { CollectionBuilder } from '../utils/builders/CollectionBuilder';
 import { CardTypeEnum } from '../../domain/value-objects/CardType';
+import { FakeEventPublisher } from '../utils/FakeEventPublisher';
 
 describe('AddUrlToLibraryUseCase', () => {
   let useCase: AddUrlToLibraryUseCase;
@@ -19,6 +20,7 @@ describe('AddUrlToLibraryUseCase', () => {
   let metadataService: FakeMetadataService;
   let cardLibraryService: CardLibraryService;
   let cardCollectionService: CardCollectionService;
+  let eventPublisher: FakeEventPublisher;
   let curatorId: CuratorId;
 
   beforeEach(() => {
@@ -27,6 +29,7 @@ describe('AddUrlToLibraryUseCase', () => {
     cardPublisher = new FakeCardPublisher();
     collectionPublisher = new FakeCollectionPublisher();
     metadataService = new FakeMetadataService();
+    eventPublisher = new FakeEventPublisher();
 
     cardLibraryService = new CardLibraryService(cardRepository, cardPublisher);
     cardCollectionService = new CardCollectionService(
@@ -39,6 +42,7 @@ describe('AddUrlToLibraryUseCase', () => {
       metadataService,
       cardLibraryService,
       cardCollectionService,
+      eventPublisher,
     );
 
     curatorId = CuratorId.create('did:plc:testcurator').unwrap();
@@ -50,6 +54,7 @@ describe('AddUrlToLibraryUseCase', () => {
     cardPublisher.clear();
     collectionPublisher.clear();
     metadataService.clear();
+    eventPublisher.clear();
   });
 
   describe('Basic URL card creation', () => {
diff --git a/src/modules/cards/tests/utils/FakeEventPublisher.ts b/src/modules/cards/tests/utils/FakeEventPublisher.ts
new file mode 100644
index 00000000..89440fe1
--- /dev/null
+++ b/src/modules/cards/tests/utils/FakeEventPublisher.ts
@@ -0,0 +1,34 @@
+import { IEventPublisher } from '../../../../shared/application/events/IEventPublisher';
+import { IDomainEvent } from '../../../../shared/domain/events/IDomainEvent';
+import { Result, ok, err } from '../../../../shared/core/Result';
+
+export class FakeEventPublisher implements IEventPublisher {
+  private publishedEvents: IDomainEvent[] = [];
+  private shouldFail: boolean = false;
+
+  async publishEvents(events: IDomainEvent[]): Promise<Result<void>> {
+    if (this.shouldFail) {
+      return err(new Error('Event publishing failed'));
+    }
+
+    this.publishedEvents.push(...events);
+    return ok(undefined);
+  }
+
+  getPublishedEvents(): IDomainEvent[] {
+    return [...this.publishedEvents];
+  }
+
+  getPublishedEventsOfType<T extends IDomainEvent>(eventType: new (...args: any[]) => T): T[] {
+    return this.publishedEvents.filter(event => event instanceof eventType) as T[];
+  }
+
+  setShouldFail(shouldFail: boolean): void {
+    this.shouldFail = shouldFail;
+  }
+
+  clear(): void {
+    this.publishedEvents = [];
+    this.shouldFail = false;
+  }
+}
diff --git a/src/shared/core/UseCase.ts b/src/shared/core/UseCase.ts
index a2fe407e..29b2ddd1 100644
--- a/src/shared/core/UseCase.ts
+++ b/src/shared/core/UseCase.ts
@@ -1,5 +1,4 @@
 import { IEventPublisher } from '../application/events/IEventPublisher';
-import { DomainEvents } from '../domain/events/DomainEvents';
 import { AggregateRoot } from '../domain/AggregateRoot';
 import { Result, ok } from './Result';
 
@@ -15,7 +14,7 @@ export abstract class BaseUseCase<IRequest, IResponse> implements UseCase<IReque
   protected async publishEventsForAggregate(
     aggregate: AggregateRoot<any>
   ): Promise<Result<void>> {
-    const events = DomainEvents.getEventsForAggregate(aggregate.id);
+    const events = aggregate.domainEvents;
     
     if (events.length === 0) {
       return ok(undefined);
@@ -24,7 +23,7 @@ export abstract class BaseUseCase<IRequest, IResponse> implements UseCase<IReque
     const publishResult = await this.eventPublisher.publishEvents(events);
     
     if (publishResult.isOk()) {
-      DomainEvents.clearEventsForAggregate(aggregate.id);
+      aggregate.clearEvents();
     }
     
     return publishResult;
diff --git a/src/shared/domain/AggregateRoot.ts b/src/shared/domain/AggregateRoot.ts
index 50b0a177..c61ecee5 100644
--- a/src/shared/domain/AggregateRoot.ts
+++ b/src/shared/domain/AggregateRoot.ts
@@ -1,6 +1,5 @@
 import { Entity } from './Entity';
 import { IDomainEvent } from './events/IDomainEvent';
-import { DomainEvents } from './events/DomainEvents';
 import { UniqueEntityID } from './UniqueEntityID';
 
 export abstract class AggregateRoot<T> extends Entity<T> {
@@ -15,12 +14,7 @@ export abstract class AggregateRoot<T> extends Entity<T> {
   }
 
   protected addDomainEvent(domainEvent: IDomainEvent): void {
-    // Add the domain event to this aggregate's list of domain events
     this._domainEvents.push(domainEvent);
-    // Add this aggregate instance to the domain event's list of aggregates who's
-    // events it eventually needs to dispatch.
-    DomainEvents.markAggregateForDispatch(this);
-    // Log the domain event
     this.logDomainEventAdded(domainEvent);
   }
 
diff --git a/src/shared/infrastructure/events/EventHandlerRegistry.ts b/src/shared/infrastructure/events/EventHandlerRegistry.ts
index 811a1c97..a3087e7c 100644
--- a/src/shared/infrastructure/events/EventHandlerRegistry.ts
+++ b/src/shared/infrastructure/events/EventHandlerRegistry.ts
@@ -1,4 +1,3 @@
-import { DomainEvents } from '../../domain/events/DomainEvents';
 import { CardAddedToLibraryEvent } from '../../../modules/cards/domain/events/CardAddedToLibraryEvent';
 import { IEventPublisher } from '../../application/events/IEventPublisher';
 
@@ -6,21 +5,14 @@ export class EventHandlerRegistry {
   constructor(private eventPublisher: IEventPublisher) {}
 
   registerAllHandlers(): void {
-    // Register distributed event publishing
-    DomainEvents.register(
-      async (event: CardAddedToLibraryEvent) => {
-        try {
-          await this.eventPublisher.publishEvents([event]);
-        } catch (error) {
-          console.error('Error publishing event to BullMQ:', error);
-          // Don't fail the main operation if event publishing fails
-        }
-      },
-      CardAddedToLibraryEvent.name,
-    );
+    // Note: With the simplified architecture, event handlers are now registered
+    // directly with the IEventSubscriber implementation (e.g., BullMQEventSubscriber)
+    // This class can be removed or repurposed for other event system setup
+    console.log('EventHandlerRegistry: Using simplified event architecture');
   }
 
   clearAllHandlers(): void {
-    DomainEvents.clearHandlers();
+    // No longer needed with simplified architecture
+    console.log('EventHandlerRegistry: No handlers to clear in simplified architecture');
   }
 }