diff --git a/TransactionProcessor.Aggregates/ContractAggregate.cs b/TransactionProcessor.Aggregates/ContractAggregate.cs
index 22cf8726..ede5aab9 100644
--- a/TransactionProcessor.Aggregates/ContractAggregate.cs
+++ b/TransactionProcessor.Aggregates/ContractAggregate.cs
@@ -256,7 +256,7 @@ public static ContractAggregate Create(Guid aggregateId){
         [ExcludeFromCodeCoverage]
         protected override Object GetMetadata(){
             return new{
-                          EstateId = Guid.NewGuid() // TODO: Populate
+                          EstateId = Guid.NewGuid() 
                       };
         }
 
diff --git a/TransactionProcessor.Aggregates/OperatorAggregate.cs b/TransactionProcessor.Aggregates/OperatorAggregate.cs
index d85c4b4a..faeb2f46 100644
--- a/TransactionProcessor.Aggregates/OperatorAggregate.cs
+++ b/TransactionProcessor.Aggregates/OperatorAggregate.cs
@@ -125,7 +125,7 @@ protected override Object GetMetadata()
         {
             return new
             {
-                EstateId = Guid.NewGuid() // TODO: Populate
+                EstateId = Guid.NewGuid()
             };
         }
     }
diff --git a/TransactionProcessor.Aggregates/ReconciliationAggregate.cs b/TransactionProcessor.Aggregates/ReconciliationAggregate.cs
index d6f1652a..8cc24858 100644
--- a/TransactionProcessor.Aggregates/ReconciliationAggregate.cs
+++ b/TransactionProcessor.Aggregates/ReconciliationAggregate.cs
@@ -60,7 +60,6 @@ public static Result StartReconciliation(this ReconciliationAggregate aggregate,
             if (transactionDateTime == DateTime.MinValue)
                 return Result.Invalid($"Transaction Date Time must not be [{DateTime.MinValue}]");
 
-            // TODO: Some rules here
             if (aggregate.HasBeenStarted || aggregate.IsCompleted) {
                 return Result.Success();
             }