diff --git a/src/EntityFramework.Storage/test/IntegrationTests/Stores/Compatibility/IdentityServerServerSideSessionStoreTests.cs b/src/EntityFramework.Storage/test/IntegrationTests/Stores/Compatibility/IdentityServerServerSideSessionStoreTests.cs
index d7b41db70..b3a61aaac 100644
--- a/src/EntityFramework.Storage/test/IntegrationTests/Stores/Compatibility/IdentityServerServerSideSessionStoreTests.cs
+++ b/src/EntityFramework.Storage/test/IntegrationTests/Stores/Compatibility/IdentityServerServerSideSessionStoreTests.cs
@@ -599,8 +599,7 @@ public async Task GetAndRemoveExpiredSessions_WhenExpiredSessionsExist_AndExceed
         actual.Should().Contain(x => x.Key == expiredSession0.Key);
         actual.Should().Contain(x => x.Key == expiredSession1.Key);
     }
-
-    //TODO: Finish implementing test
+    
     [Theory, MemberData(nameof(TestDatabaseProviders))]
     public async Task GetAndRemoveExpiredSessions_WhenUnspecifiedTimezoneInDbEntities_ShouldBeTreatedAsUtc(DbContextOptions<PersistedGrantDbContext> options)
     {
diff --git a/src/Open.IdentityServer/src/Services/IUserSessionEventsService.cs b/src/Open.IdentityServer/src/Services/IUserSessionEventsService.cs
index 81f7fe278..31bc15203 100644
--- a/src/Open.IdentityServer/src/Services/IUserSessionEventsService.cs
+++ b/src/Open.IdentityServer/src/Services/IUserSessionEventsService.cs
@@ -17,14 +17,12 @@ public interface IUserSessionEventsService
     /// Triggered when the session logout occurs
     /// </summary>
     /// <param name="sessionEventContext">context needed for handling logout event</param>
-    /// <returns></returns>
     public Task HandleUserSessionLogout(EndUserSessionEventContext sessionEventContext);
     
     /// <summary>
     /// Triggered when the session expires
     /// </summary>
     /// <param name="sessionEventContext">context needed for handling logout event</param>
-    /// <returns></returns>
     public Task HandleUserSessionExpiry(EndUserSessionEventContext sessionEventContext);
     
     /// <summary>
diff --git a/src/Open.IdentityServer/src/Validation/Default/DefaultServerSideSessionTokenValidator.cs b/src/Open.IdentityServer/src/Validation/Default/DefaultServerSideSessionTokenValidator.cs
index 3fa6ed0a2..a71aee40e 100644
--- a/src/Open.IdentityServer/src/Validation/Default/DefaultServerSideSessionTokenValidator.cs
+++ b/src/Open.IdentityServer/src/Validation/Default/DefaultServerSideSessionTokenValidator.cs
@@ -13,12 +13,6 @@
 
 namespace Open.IdentityServer.Validation;
 
-/// <summary>
-/// 
-/// </summary>
-/// <param name="decorator"></param>
-/// <param name="userSessionEventsService"></param>
-/// <param name="telemetry"></param>
 internal class DefaultServerSideSessionTokenValidator(
     Decorator<ITokenValidator> decorator,
     IUserSessionEventsService userSessionEventsService,
@@ -26,12 +20,7 @@ internal class DefaultServerSideSessionTokenValidator(
 {
     private ITokenValidator decoratedService = decorator?.Instance ?? throw new ArgumentNullException(nameof(decorator));
     
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="token"></param>
-    /// <param name="expectedScope"></param>
-    /// <returns></returns>
+    /// <inheritdoc />
     public async Task<TokenValidationResult?> ValidateAccessTokenAsync(string token, string? expectedScope = null)
     {
         using ITrace? trace = telemetry.Trace(TelemetryConstants.TraceCategories.Validation, this);
diff --git a/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Stores/InMemorySessionStoreTests.cs b/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Stores/InMemorySessionStoreTests.cs
index 838453365..13f0e4ce4 100644
--- a/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Stores/InMemorySessionStoreTests.cs
+++ b/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Stores/InMemorySessionStoreTests.cs
@@ -418,14 +418,6 @@ public async Task FilterSessions_WhenSessionMatch_ShouldReturnMatchingSessions()
         actual.Should().Contain(x => x.Key == "key-1");
         actual.Should().Contain(x => x.Key == "key-6");
     }
-    
-    /// TODO: implement filter with query tests, types of query to test
-    /// 1. When no filter is provided, should use default values
-    /// 2. When no token is provided, it should get the first page of results
-    /// 3. When a token is provided, it should get the next page relative to the provided token
-    /// 4. When a subjectId filter is provided, it should filter the results using it
-    /// 5. When a sessionId filter is provided, it should filter results using it
-    /// 6. When a display name filter is provided, it should filter results using it
 
     [Fact]
     public async Task FilterSessions_WithQuery_WhenNoResults_ShouldEmptyResultsSet()
diff --git a/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Validation/Default/DefaultServerSideSessionRefreshTokenServiceTests.cs b/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Validation/Default/DefaultServerSideSessionRefreshTokenServiceTests.cs
index 07b0da6c2..14eb723f9 100644
--- a/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Validation/Default/DefaultServerSideSessionRefreshTokenServiceTests.cs
+++ b/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Validation/Default/DefaultServerSideSessionRefreshTokenServiceTests.cs
@@ -196,13 +196,5 @@ public async Task PublicMethods_WithCustomisedLogic_WhenCalled_ShouldTelemetryTr
                     TelemetryConstants.TraceCategories.Validation, sut, method.traceMethodName), Times.Once);
             Mock.Get(trace).Verify(t => t.Dispose(), Times.Once);
         }
-
-        // Assert all methods covered
-        // typeof(DefaultServerSideSessionRefreshTokenService).GetMethods()
-        //     .Where(m => m is { IsPublic: true, IsStatic: false, IsSpecialName: false })
-        //     .Where(m => m.DeclaringType == typeof(DefaultServerSideSessionRefreshTokenService))
-        //     .Select(m => m.Name)
-        //     .Distinct()
-        //     .Should().BeEquivalentTo(methods.Select(m => m.traceMethodName));
     }
 }
\ No newline at end of file
diff --git a/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Validation/Default/DefaultServerSideSessionTokenValidatorTests.cs b/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Validation/Default/DefaultServerSideSessionTokenValidatorTests.cs
index 232c26f2a..6d6c15e60 100644
--- a/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Validation/Default/DefaultServerSideSessionTokenValidatorTests.cs
+++ b/src/Open.IdentityServer/test/Open.IdentityServer.UnitTests/Validation/Default/DefaultServerSideSessionTokenValidatorTests.cs
@@ -207,13 +207,5 @@ public async Task PublicMethods_WithCustomisedLogic_WhenCalled_ShouldTelemetryTr
                     TelemetryConstants.TraceCategories.Validation, sut, method.traceMethodName), Times.Once);
             Mock.Get(trace).Verify(t => t.Dispose(), Times.Once);
         }
-
-        // Assert all methods covered
-        // typeof(DefaultServerSideSessionTokenValidator).GetMethods()
-        //     .Where(m => m is { IsPublic: true, IsStatic: false, IsSpecialName: false })
-        //     .Where(m => m.DeclaringType == typeof(DefaultServerSideSessionTokenValidator))
-        //     .Select(m => m.Name)
-        //     .Distinct()
-        //     .Should().BeEquivalentTo(methods.Select(m => m.traceMethodName));
     }
 }
\ No newline at end of file