diff --git a/docs/AlarmClientDiscovery.md b/docs/AlarmClientDiscovery.md
index ba1e4ca..e03ac9d 100644
--- a/docs/AlarmClientDiscovery.md
+++ b/docs/AlarmClientDiscovery.md
@@ -770,9 +770,8 @@ on cross-apartment marshaling unless the host STA pumps Win32
 messages. The smoke test sidesteps this by setting
 `pollIntervalMilliseconds=0` (Timer disabled) and driving `PollOnce`
 manually from the test's STA. Production alarm polling was wired up
-through the worker's `StaRuntime` via `GatewayAlarmMonitor`, which
-owns the STA pump and drives alarm subscriptions through the worker
-IPC path. This item is resolved; the wnwrap consumer's `PollOnce`
+through `GatewayAlarmMonitor`, which routes polling through the
+worker's `StaRuntime` (the STA pump owner) via the worker IPC path. This item is resolved; the wnwrap consumer's `PollOnce`
 is no longer invoked directly in production.
 
 ### Capture summary
diff --git a/src/ZB.MOM.WW.MxGateway.Tests/Galaxy/GalaxyFilterInputSafetyTests.cs b/src/ZB.MOM.WW.MxGateway.Tests/Galaxy/GalaxyFilterInputSafetyTests.cs
index ab18465..f434fd6 100644
--- a/src/ZB.MOM.WW.MxGateway.Tests/Galaxy/GalaxyFilterInputSafetyTests.cs
+++ b/src/ZB.MOM.WW.MxGateway.Tests/Galaxy/GalaxyFilterInputSafetyTests.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using Grpc.Core;
-using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
 using ZB.MOM.WW.MxGateway.Server.Dashboard;
 using ZB.MOM.WW.MxGateway.Server.Galaxy;
@@ -266,8 +265,7 @@ public sealed class GalaxyFilterInputSafetyTests
             new ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
             new StubGalaxyHierarchyCache(entry),
             new GalaxyDeployNotifier(),
-            new GatewayRequestIdentityAccessor(),
-            NullLogger<GalaxyRepositoryGrpcService>.Instance);
+            new GatewayRequestIdentityAccessor());
     }
 
     private static GalaxyHierarchyCacheEntry CreateEntry(IReadOnlyList<GalaxyObject> objects)
diff --git a/src/ZB.MOM.WW.MxGateway.Tests/Gateway/Grpc/GalaxyRepositoryGrpcServiceTests.cs b/src/ZB.MOM.WW.MxGateway.Tests/Gateway/Grpc/GalaxyRepositoryGrpcServiceTests.cs
index ee05cb9..cb0b036 100644
--- a/src/ZB.MOM.WW.MxGateway.Tests/Gateway/Grpc/GalaxyRepositoryGrpcServiceTests.cs
+++ b/src/ZB.MOM.WW.MxGateway.Tests/Gateway/Grpc/GalaxyRepositoryGrpcServiceTests.cs
@@ -1,5 +1,4 @@
 using Grpc.Core;
-using Microsoft.Extensions.Logging.Abstractions;
 using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
 using ZB.MOM.WW.MxGateway.Server.Dashboard;
 using ZB.MOM.WW.MxGateway.Server.Galaxy;
@@ -217,8 +216,7 @@ public sealed class GalaxyRepositoryGrpcServiceTests
             new global::ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
             new StubGalaxyHierarchyCache(entry),
             new GalaxyDeployNotifier(),
-            new GatewayRequestIdentityAccessor(),
-            NullLogger<GalaxyRepositoryGrpcService>.Instance);
+            new GatewayRequestIdentityAccessor());
     }
 
     private static GalaxyHierarchyCacheEntry CreateEntry(IReadOnlyList<GalaxyObject> objects)
@@ -366,8 +364,7 @@ public sealed class GalaxyRepositoryGrpcServiceTests
             new global::ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
             new NeverLoadsHierarchyCache(),
             new GalaxyDeployNotifier(),
-            new GatewayRequestIdentityAccessor(),
-            NullLogger<GalaxyRepositoryGrpcService>.Instance);
+            new GatewayRequestIdentityAccessor());
 
         // No caller-supplied CT so WaitForCacheBootstrap exits via its 5s internal budget
         // (instead of re-throwing OperationCanceledException from the caller's CT). The
@@ -448,8 +445,7 @@ public sealed class GalaxyRepositoryGrpcServiceTests
             new global::ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
             new StubGalaxyHierarchyCache(CreateEntry(CreateFilterObjects())),
             new GalaxyDeployNotifier(),
-            identityAccessor,
-            NullLogger<GalaxyRepositoryGrpcService>.Instance);
+            identityAccessor);
 
         // Sanity: with no identity pushed, both Pump and Valve come back under Line3 (id=2).
         BrowseChildrenReply unconstrained = await service.BrowseChildren(