diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs
index 7f1c4ebdb1..d70c7f9254 100644
--- a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs
+++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContext.cs
@@ -65,7 +65,6 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
 
             //Split configuration to dedicated classes
 
-            //TODO: Set Default Values for properties
             builder.Entity<IdentityUser>(b =>
             {
                 b.ToTable("IdentityUsers");
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUser.cs b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUser.cs
index 5b5ba94fcc..3003897b52 100644
--- a/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUser.cs
+++ b/src/Volo.Abp.Identity/Volo/Abp/Identity/IdentityUser.cs
@@ -11,7 +11,7 @@ using Volo.ExtensionMethods.Collections.Generic;
 
 namespace Volo.Abp.Identity
 {
-    //TODO: Add Name/Surname/FullName?
+    //Add Name and Surname properties?
 
     public class IdentityUser : AggregateRoot, IHasConcurrencyStamp
     {
diff --git a/src/Volo.Abp.Identity/Volo/Abp/Identity/UserStore.cs b/src/Volo.Abp.Identity/Volo/Abp/Identity/UserStore.cs
index d5cdb47e35..1195301981 100644
--- a/src/Volo.Abp.Identity/Volo/Abp/Identity/UserStore.cs
+++ b/src/Volo.Abp.Identity/Volo/Abp/Identity/UserStore.cs
@@ -329,7 +329,7 @@ namespace Volo.Abp.Identity
 
             if (role == null)
             {
-                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Role {0} does not exist.", normalizedRoleName)); //TODO: Localize
+                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Role {0} does not exist!", normalizedRoleName));
             }
 
             user.AddRole(_guidGenerator, role.Id);
diff --git a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/Initialize_Tests.cs b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/Initialize_Tests.cs
index ac8b510eaa..3eca23445e 100644
--- a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/Initialize_Tests.cs
+++ b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/Initialize_Tests.cs
@@ -20,9 +20,8 @@ namespace Volo.Abp.Identity
         {
             ServiceProvider.GetRequiredService<IdentityRoleManager>();
         }
-
-        //TODO: Move this service to Volo.Abp.EntityFrameworkCore.Tests since it's actually testing the EF Core repository registration!
-        [Fact]
+        
+        [Fact] //Move this test to Volo.Abp.EntityFrameworkCore.Tests since it's actually testing the EF Core repository registration!
         public void Should_Resolve_Repositories()
         {
             (ServiceProvider.GetRequiredService<IIdentityUserRepository>() is EfCoreIdentityUserRepository).ShouldBeTrue();