diff --git a/old/src/Logitar.Identity.Domain/Shared/CustomIdentifierKeyValidator.cs b/old/src/Logitar.Identity.Domain/Shared/CustomIdentifierKeyValidator.cs
deleted file mode 100644
index 59ad988..0000000
--- a/old/src/Logitar.Identity.Domain/Shared/CustomIdentifierKeyValidator.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using FluentValidation;
-
-namespace Logitar.Identity.Domain.Shared;
-
-/// <summary>
-/// The validator used to validate custom identifier keys.
-/// See <see cref="CustomIdentifierValidator"/> for more information.
-/// </summary>
-public class CustomIdentifierKeyValidator : AbstractValidator<string>
-{
-  /// <summary>
-  /// Initializes a new instance of the <see cref="CustomIdentifierKeyValidator"/> class.
-  /// </summary>
-  /// <param name="propertyName">The name of the property, used for validation.</param>
-  public CustomIdentifierKeyValidator(string? propertyName = null)
-  {
-    RuleFor(x => x).SetValidator(new IdentifierValidator()).WithPropertyName(propertyName);
-  }
-}
diff --git a/old/src/Logitar.Identity.Domain/Shared/CustomIdentifierValidator.cs b/old/src/Logitar.Identity.Domain/Shared/CustomIdentifierValidator.cs
deleted file mode 100644
index a44ece0..0000000
--- a/old/src/Logitar.Identity.Domain/Shared/CustomIdentifierValidator.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using FluentValidation;
-
-namespace Logitar.Identity.Domain.Shared;
-
-/// <summary>
-/// The validator used to validate custom identifiers.
-/// </summary>
-public class CustomIdentifierValidator : ICustomIdentifierValidator
-{
-  /// <summary>
-  /// Gets the custom identifier key validator.
-  /// </summary>
-  public IValidator<string> KeyValidator { get; }
-  /// <summary>
-  /// Gets the custom identifier value validator.
-  /// </summary>
-  public IValidator<string> ValueValidator { get; }
-
-  /// <summary>
-  /// Initializes a new instance of the <see cref="CustomIdentifierValidator"/> class.
-  /// </summary>
-  /// <param name="keyValidator">The custom identifier key validator.</param>
-  /// <param name="valueValidator">The custom identifier value validator.</param>
-  public CustomIdentifierValidator(IValidator<string>? keyValidator = null, IValidator<string>? valueValidator = null)
-  {
-    KeyValidator = keyValidator ?? new CustomIdentifierKeyValidator("Key");
-    ValueValidator = valueValidator ?? new CustomIdentifierValueValidator("Value");
-  }
-
-  /// <summary>
-  /// Validates the specified custom identifier key and value.
-  /// An <see cref="ValidationException"/> will be thrown if validation fails.
-  /// </summary>
-  /// <param name="key">The key of the custom identifier.</param>
-  /// <param name="value">The value of the custom identifier.</param>
-  public void ValidateAndThrow(string key, string value)
-  {
-    KeyValidator.ValidateAndThrow(key);
-    ValueValidator.ValidateAndThrow(value);
-  }
-}
diff --git a/old/src/Logitar.Identity.Domain/Shared/CustomIdentifierValueValidator.cs b/old/src/Logitar.Identity.Domain/Shared/CustomIdentifierValueValidator.cs
deleted file mode 100644
index f7e904a..0000000
--- a/old/src/Logitar.Identity.Domain/Shared/CustomIdentifierValueValidator.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using FluentValidation;
-
-namespace Logitar.Identity.Domain.Shared;
-
-/// <summary>
-/// The validator used to validate custom identifier values.
-/// See <see cref="CustomIdentifierValidator"/> for more information.
-/// </summary>
-public class CustomIdentifierValueValidator : AbstractValidator<string>
-{
-  /// <summary>
-  /// The maximum length of custom identifier values.
-  /// </summary>
-  public const int MaximumLength = byte.MaxValue;
-
-  /// <summary>
-  /// Initializes a new instance of the <see cref="CustomIdentifierValueValidator"/> class.
-  /// </summary>
-  /// <param name="propertyName">The name of the property, used for validation.</param>
-  public CustomIdentifierValueValidator(string? propertyName = null)
-  {
-    RuleFor(x => x).NotEmpty().MaximumLength(MaximumLength).WithPropertyName(propertyName);
-  }
-}
diff --git a/old/src/Logitar.Identity.Domain/Shared/FutureValidator.cs b/old/src/Logitar.Identity.Domain/Shared/FutureValidator.cs
deleted file mode 100644
index c0372fd..0000000
--- a/old/src/Logitar.Identity.Domain/Shared/FutureValidator.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using FluentValidation;
-
-namespace Logitar.Identity.Domain.Shared;
-
-/// <summary>
-/// The validator used to validate future dates.
-/// </summary>
-public class FutureValidator : AbstractValidator<DateTime>
-{
-  /// <summary>
-  /// Initializes a new instance of the <see cref="FutureValidator"/> class.
-  /// </summary>
-  /// <param name="moment">The validation moment, defauts to now.</param>
-  public FutureValidator(DateTime? moment = null)
-  {
-    RuleFor(x => x).Must(value => value > (moment ?? DateTime.Now))
-      .WithErrorCode(nameof(FutureValidator))
-      .WithMessage("'{PropertyName}' must be a date and time set in the future.");
-  }
-}
diff --git a/old/src/Logitar.Identity.Domain/Shared/ICustomIdentifierValidator.cs b/old/src/Logitar.Identity.Domain/Shared/ICustomIdentifierValidator.cs
deleted file mode 100644
index 4abe9e0..0000000
--- a/old/src/Logitar.Identity.Domain/Shared/ICustomIdentifierValidator.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using FluentValidation;
-
-namespace Logitar.Identity.Domain.Shared;
-
-/// <summary>
-/// Describes custom identifier validators.
-/// </summary>
-public interface ICustomIdentifierValidator
-{
-  /// <summary>
-  /// Gets the custom identifier key validator.
-  /// </summary>
-  IValidator<string> KeyValidator { get; }
-  /// <summary>
-  /// Gets the custom identifier value validator.
-  /// </summary>
-  IValidator<string> ValueValidator { get; }
-
-  /// <summary>
-  /// Validates the specified custom identifier key and value.
-  /// An <see cref="ValidationException"/> will be thrown if validation fails.
-  /// </summary>
-  /// <param name="key">The key of the custom identifier.</param>
-  /// <param name="value">The value of the custom identifier.</param>
-  void ValidateAndThrow(string key, string value);
-}
diff --git a/old/src/Logitar.Identity.Domain/Shared/PastValidator.cs b/old/src/Logitar.Identity.Domain/Shared/PastValidator.cs
deleted file mode 100644
index fa5d3e7..0000000
--- a/old/src/Logitar.Identity.Domain/Shared/PastValidator.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using FluentValidation;
-
-namespace Logitar.Identity.Domain.Shared;
-
-/// <summary>
-/// The validator used to validate past dates.
-/// </summary>
-public class PastValidator : AbstractValidator<DateTime>
-{
-  /// <summary>
-  /// Initializes a new instance of the <see cref="PastValidator"/> class.
-  /// </summary>
-  /// <param name="moment">The validation moment, defauts to now.</param>
-  public PastValidator(DateTime? moment = null)
-  {
-    RuleFor(x => x).Must(value => value < (moment ?? DateTime.Now))
-      .WithErrorCode(nameof(PastValidator))
-      .WithMessage("'{PropertyName}' must be a date and time set in the past.");
-  }
-}
diff --git a/old/src/Logitar.Identity.Domain/Users/UserAggregate.cs b/old/src/Logitar.Identity.Domain/Users/UserAggregate.cs
index f525506..4daa5d8 100644
--- a/old/src/Logitar.Identity.Domain/Users/UserAggregate.cs
+++ b/old/src/Logitar.Identity.Domain/Users/UserAggregate.cs
@@ -1,7 +1,5 @@
 using Logitar.EventSourcing;
 using Logitar.Identity.Domain.Sessions;
-using Logitar.Identity.Domain.Shared;
-using Logitar.Identity.Domain.Users.Events;
 
 namespace Logitar.Identity.Domain.Users;