diff --git a/src/DigitalData.MessagingService.API/Middleware/ExceptionHandlingMiddleware.cs b/src/DigitalData.MessagingService.API/Middleware/ExceptionHandlingMiddleware.cs
index bc311aa..c9d4abe 100644
--- a/src/DigitalData.MessagingService.API/Middleware/ExceptionHandlingMiddleware.cs
+++ b/src/DigitalData.MessagingService.API/Middleware/ExceptionHandlingMiddleware.cs
@@ -48,13 +48,7 @@ public class ExceptionHandlingMiddleware
AuthenticationFailedException authEx =>
(HttpStatusCode.Unauthorized, authEx.Message),
-
- DmsNotAvailableException dmsEx =>
- (HttpStatusCode.ServiceUnavailable, dmsEx.Message),
-
- InvalidPdfException pdfEx =>
- (HttpStatusCode.BadRequest, pdfEx.Message),
-
+
FluentValidation.ValidationException validationEx =>
(HttpStatusCode.BadRequest, FormatValidationErrors(validationEx)),
diff --git a/src/DigitalData.MessagingService.Domain/Common/BaseEntity.cs b/src/DigitalData.MessagingService.Domain/Common/BaseEntity.cs
deleted file mode 100644
index 9b59f1f..0000000
--- a/src/DigitalData.MessagingService.Domain/Common/BaseEntity.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace DigitalData.MessagingService.Domain.Common;
-
-public abstract class BaseEntity
-{
- public DateTime? CreatedDate { get; set; }
- public string? CreatedBy { get; set; }
- public DateTime? ModifiedDate { get; set; }
- public string? ModifiedBy { get; set; }
-}
diff --git a/src/DigitalData.MessagingService.Domain/Common/DomainConstants.cs b/src/DigitalData.MessagingService.Domain/Common/DomainConstants.cs
deleted file mode 100644
index cafe165..0000000
--- a/src/DigitalData.MessagingService.Domain/Common/DomainConstants.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace DigitalData.MessagingService.Domain.Common;
-
-///
-/// Domain-wide constants
-///
-public static class DomainConstants
-{
- ///
- /// Email processing constants
- ///
- public static class Email
- {
- ///
- /// Maximum number of retry attempts for failed email sending
- /// After this limit, email will be moved to Dead Letter Queue (DLQ)
- ///
- public const int MaxRetryCount = 3;
- }
-}
diff --git a/src/DigitalData.MessagingService.Domain/Common/IAggregateRoot.cs b/src/DigitalData.MessagingService.Domain/Common/IAggregateRoot.cs
deleted file mode 100644
index 797ec96..0000000
--- a/src/DigitalData.MessagingService.Domain/Common/IAggregateRoot.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace DigitalData.MessagingService.Domain.Common;
-
-///
-/// Marker interface for aggregate roots in DDD
-///
-public interface IAggregateRoot
-{
-}
diff --git a/src/DigitalData.MessagingService.Domain/Common/ValueObject.cs b/src/DigitalData.MessagingService.Domain/Common/ValueObject.cs
deleted file mode 100644
index 425a6ff..0000000
--- a/src/DigitalData.MessagingService.Domain/Common/ValueObject.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-namespace DigitalData.MessagingService.Domain.Common;
-
-///
-/// Base class for value objects that implement equality by value
-///
-public abstract class ValueObject
-{
- protected abstract IEnumerable