diff --git a/java/google/registry/keyring/kms/KeyringModule.java b/java/google/registry/keyring/kms/KeyringModule.java
index 317c4fd3e..7a9b53f80 100644
--- a/java/google/registry/keyring/kms/KeyringModule.java
+++ b/java/google/registry/keyring/kms/KeyringModule.java
@@ -16,9 +16,7 @@ package google.registry.keyring.kms;
 
 import dagger.Module;
 import dagger.Provides;
-
 import google.registry.keyring.api.Keyring;
-
 import javax.inject.Singleton;
 
 /** Dagger module for {@link Keyring} */
@@ -27,7 +25,6 @@ public final class KeyringModule {
 
   @Provides
   @Singleton
-  // TODO(b/35810650): return kmsKeyring directly once comparison period is over.
   public static Keyring provideKeyring(KmsKeyring kmsKeyring) {
     return kmsKeyring;
   }
diff --git a/java/google/registry/model/registry/Registry.java b/java/google/registry/model/registry/Registry.java
index 19dbf2337..f572c65ec 100644
--- a/java/google/registry/model/registry/Registry.java
+++ b/java/google/registry/model/registry/Registry.java
@@ -385,6 +385,7 @@ public class Registry extends ImmutableObject implements Buildable {
   TimedTransitionProperty<Money, BillingCostTransition> eapFeeSchedule =
       TimedTransitionProperty.forMapify(DEFAULT_EAP_BILLING_COST, BillingCostTransition.class);
 
+  /** Marksdb LORDN service username (password is stored in Keyring)  */
   String lordnUsername;
 
   /** The end of the claims period (at or after this time, claims no longer applies). */
diff --git a/java/google/registry/model/server/ServerSecret.java b/java/google/registry/model/server/ServerSecret.java
index 847acf86f..82d5cc543 100644
--- a/java/google/registry/model/server/ServerSecret.java
+++ b/java/google/registry/model/server/ServerSecret.java
@@ -35,6 +35,7 @@ import java.util.concurrent.ExecutionException;
 @Entity
 @Unindex
 @NotBackedUp(reason = Reason.AUTO_GENERATED)
+// TODO(b/27427316): Replace this with an entry in KMSKeyring
 public class ServerSecret extends CrossTldSingleton {
 
   /**
diff --git a/java/google/registry/module/frontend/BUILD b/java/google/registry/module/frontend/BUILD
index a140ebd64..dd6bfd7ed 100644
--- a/java/google/registry/module/frontend/BUILD
+++ b/java/google/registry/module/frontend/BUILD
@@ -20,7 +20,6 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/request:modules",
         "//java/google/registry/request/auth",
-        "//java/google/registry/security",
         "//java/google/registry/ui",
         "//java/google/registry/ui/server/registrar",
         "//java/google/registry/util",