diff --git a/src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java b/src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java
index 03158e993f..7f599c9d8b 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java
@@ -345,7 +345,6 @@ public static Expr createLroSettingsBuilderExpr(
                     .build())
             .build();
 
-    // TODO(miraleung): Determine fianl LRO settings values here.
     Expr lroRetrySettingsExpr = createLroRetrySettingsExpr();
     Expr pollAlgoExpr =
         MethodInvocationExpr.builder()
@@ -488,7 +487,6 @@ private static List<Expr> createRetrySettingsExprs(
   }
 
   private static Expr createLroRetrySettingsExpr() {
-    // TODO(miraleung): Determine fianl LRO settings values here.
     Expr lroRetrySettingsExpr =
         MethodInvocationExpr.builder()
             .setStaticReferenceType(STATIC_TYPES.get("RetrySettings"))
@@ -519,7 +517,7 @@ private static Expr createLroRetrySettingsExpr() {
 
     Expr zeroDurationExpr =
         EnumRefExpr.builder().setType(STATIC_TYPES.get("Duration")).setName("ZERO").build();
-    // TODO(miraleung): Find a way to add an "// ignored" comment here.
+    // TODO(miraleung): Add an "// ignored" comment here.
     lroRetrySettingsExpr =
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(lroRetrySettingsExpr)
@@ -527,7 +525,7 @@ private static Expr createLroRetrySettingsExpr() {
             .setArguments(zeroDurationExpr)
             .build();
 
-    // TODO(miraleung): Find a way to add an "// ignored" comment here.
+    // TODO(miraleung): Add an "// ignored" comment here.
     lroRetrySettingsExpr =
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(lroRetrySettingsExpr)
@@ -535,7 +533,7 @@ private static Expr createLroRetrySettingsExpr() {
             .setArguments(toValExpr(LRO_DEFAULT_MAX_RPC_TIMEOUT))
             .build();
 
-    // TODO(miraleung): Find a way to add an "// ignored" comment here.
+    // TODO(miraleung): Add an "// ignored" comment here.
     lroRetrySettingsExpr =
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(lroRetrySettingsExpr)
diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
index 0b2b9cf020..03033af23c 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
@@ -1464,7 +1464,6 @@ private static List<Statement> createRpcExceptionTestStatements(
                 .setVariableExpr(varExpr.toBuilder().setIsDecl(true).build())
                 .setValueExpr(valExpr)
                 .build());
-        // TODO(miraleung): Empty line here.
       }
     }
     String rpcJavaName = JavaStyle.toLowerCamelCase(method.name());
diff --git a/src/main/java/com/google/api/generator/gapic/protoparser/TypeParser.java b/src/main/java/com/google/api/generator/gapic/protoparser/TypeParser.java
index a5f45faad9..8291fd28ab 100644
--- a/src/main/java/com/google/api/generator/gapic/protoparser/TypeParser.java
+++ b/src/main/java/com/google/api/generator/gapic/protoparser/TypeParser.java
@@ -35,7 +35,6 @@
 import javax.annotation.Nonnull;
 
 public class TypeParser {
-  // TODO(miraleung): Add a test.
   private static Reference REFERENCE_BYTE_STRING = ConcreteReference.withClazz(ByteString.class);
   private static TypeNode TYPE_NODE_BYTE_STRING = TypeNode.withReference(REFERENCE_BYTE_STRING);
 
@@ -115,9 +114,9 @@ static Reference parseFieldReference(FieldDescriptor field) {
 
   @VisibleForTesting
   static Reference parseMessageReference(@Nonnull Descriptor messageDescriptor) {
-    // TODO(miraleung): Handle deeper levels of nesting.
     List<String> outerNestedTypeNames = new ArrayList<>();
     Descriptor containingType = messageDescriptor.getContainingType();
+    // Handles nesting.
     while (containingType != null) {
       // Outermost type in the nested type hierarchy lies at index 0.
       outerNestedTypeNames.add(0, containingType.getName());
@@ -150,13 +149,13 @@ static Reference parseEnumReference(@Nonnull EnumDescriptor enumDescriptor) {
     // EnumDescriptor and Descriptor are sibling types.
     List<String> outerNestedTypeNames = new ArrayList<>();
     Descriptor containingType = enumDescriptor.getContainingType();
+    // Handles nesting.
     while (containingType != null) {
       // Outermost type in the nested type hierarchy lies at index 0.
       outerNestedTypeNames.add(0, containingType.getName());
       containingType = containingType.getContainingType();
     }
 
-    // TODO(miraleung): Handle deeper levels of nesting.
     String pakkage = getPackage(enumDescriptor.getFile());
     Reference enumReference =
         VaporReference.builder()