diff --git a/core/src/main/java/org/mobilitydata/gtfsvalidator/validator/ValidatorLoader.java b/core/src/main/java/org/mobilitydata/gtfsvalidator/validator/ValidatorLoader.java
index 0a9c8748f7..5ce79a045b 100644
--- a/core/src/main/java/org/mobilitydata/gtfsvalidator/validator/ValidatorLoader.java
+++ b/core/src/main/java/org/mobilitydata/gtfsvalidator/validator/ValidatorLoader.java
@@ -19,7 +19,6 @@
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ListMultimap;
-import com.google.common.flogger.FluentLogger;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -44,9 +43,6 @@
  * classes.
  */
 public class ValidatorLoader {
-
-  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-
   private final ListMultimap<Class<? extends GtfsEntity>, Class<? extends SingleEntityValidator<?>>>
       singleEntityValidators = ArrayListMultimap.create();
   private final ListMultimap<Class<? extends GtfsTableContainer<?>>, Class<? extends FileValidator>>
diff --git a/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/GtfsAnnotationProcessor.java b/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/GtfsAnnotationProcessor.java
index 28ad0881cc..7c3c96cb2f 100644
--- a/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/GtfsAnnotationProcessor.java
+++ b/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/GtfsAnnotationProcessor.java
@@ -83,7 +83,6 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
   }
 
   @Override
-  @SuppressWarnings("unchecked")
   public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
     List<GtfsEnumDescriptor> enumDescriptors = new ArrayList<>();
     for (TypeElement type : typesIn(annotatedElementsIn(roundEnv, GtfsEnumValues.class))) {
diff --git a/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/TableContainerIndexGenerator.java b/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/TableContainerIndexGenerator.java
index 6ceb60b637..9f08595d48 100644
--- a/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/TableContainerIndexGenerator.java
+++ b/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/TableContainerIndexGenerator.java
@@ -68,8 +68,7 @@ void generateMethods(TypeSpec.Builder typeSpec) {
           fileDescriptor.getSingleColumnPrimaryKey(),
           classNames.entityImplementationTypeName());
     } else if (fileDescriptor.hasMultiColumnPrimaryKey()) {
-      addMapByCompositeKey(
-          typeSpec, fileDescriptor.primaryKeys(), classNames.entityImplementationTypeName());
+      addMapByCompositeKey(typeSpec, classNames.entityImplementationTypeName());
     }
 
     for (GtfsFieldDescriptor indexField : fileDescriptor.indices()) {
@@ -164,9 +163,7 @@ private static void addMapWithGetter(
             .build());
   }
 
-  private static void addMapByCompositeKey(
-      TypeSpec.Builder typeSpec, ImmutableList<GtfsFieldDescriptor> keys, TypeName entityTypeName) {
-
+  private static void addMapByCompositeKey(TypeSpec.Builder typeSpec, TypeName entityTypeName) {
     // Field: Map<CompositeKey, EntityType?> byCompositeKeyMap;
     TypeName keyMapType =
         ParameterizedTypeName.get(