diff --git a/src/main/java/com/onthegomap/planetiler/basemap/BasemapProfile.java b/src/main/java/com/onthegomap/planetiler/basemap/BasemapProfile.java
index a9cc055..f5a8308 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/BasemapProfile.java
+++ b/src/main/java/com/onthegomap/planetiler/basemap/BasemapProfile.java
@@ -244,7 +244,7 @@ public class BasemapProfile extends ForwardingProfile {
    */
   public interface IgnoreWikidata {}
 
-  private static record RowDispatch(
+  private record RowDispatch(
     Tables.Constructor constructor,
     List<Tables.RowHandler<Tables.Row>> handlers
   ) {}
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/Generate.java b/src/main/java/com/onthegomap/planetiler/basemap/Generate.java
index f9e1397..c019158 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/Generate.java
+++ b/src/main/java/com/onthegomap/planetiler/basemap/Generate.java
@@ -387,7 +387,7 @@ public class Generate {
           }
 
           /** The {@code rowClass} of an imposm3 table row and its constructor coerced to a {@link Constructor}. */
-          public static record RowClassAndConstructor(
+          public record RowClassAndConstructor(
             Class<? extends Row> rowClass,
             Constructor create
           ) {}
@@ -401,7 +401,7 @@ public class Generate {
           }
 
           /** The {@code handlerClass} of a layer handler and it's {@code process} method coerced to a {@link RowHandler}. */
-          public static record RowHandlerAndClass<T extends Row>(
+          public record RowHandlerAndClass<T extends Row>(
             Class<?> handlerClass,
             RowHandler<T> handler
           ) {}
@@ -436,7 +436,7 @@ public class Generate {
 
         tablesClass.append("""
           /** An OSM element that would appear in the {@code %s} table generated by imposm3. */
-          public static record %s(%s) implements Row, %s {
+          public record %s(%s) implements Row, %s {
             public %s(SourceFeature source, String mappingKey) {
               this(%s);
             }
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/Boundary.java b/src/main/java/com/onthegomap/planetiler/basemap/layers/Boundary.java
index 9f70621..13ce441 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/Boundary.java
+++ b/src/main/java/com/onthegomap/planetiler/basemap/layers/Boundary.java
@@ -421,7 +421,7 @@ public class Boundary implements
       .orElse(null);
   }
 
-  private static record BorderingRegions(Long left, Long right) {
+  private record BorderingRegions(Long left, Long right) {
 
     public static BorderingRegions empty() {
       return new BorderingRegions(null, null);
@@ -432,7 +432,7 @@ public class Boundary implements
    * Minimal set of information extracted from a boundary relation to be used when processing each way in that
    * relation.
    */
-  private static record BoundaryRelation(
+  private record BoundaryRelation(
     long id,
     int adminLevel,
     boolean disputed,
@@ -454,7 +454,7 @@ public class Boundary implements
   }
 
   /** Information to hold onto from processing a way in a boundary relation to determine the left/right region ID later. */
-  private static record CountryBoundaryComponent(
+  private record CountryBoundaryComponent(
     int adminLevel,
     boolean disputed,
     boolean maritime,
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/Building.java b/src/main/java/com/onthegomap/planetiler/basemap/layers/Building.java
index 029af36..dd2e61f 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/Building.java
+++ b/src/main/java/com/onthegomap/planetiler/basemap/layers/Building.java
@@ -182,7 +182,7 @@ public class Building implements
     return (mergeZ13Buildings && zoom == 13) ? FeatureMerge.mergeNearbyPolygons(items, 4, 4, 0.5, 0.5) : items;
   }
 
-  private static record BuildingRelationInfo(long id) implements OsmRelationInfo {
+  private record BuildingRelationInfo(long id) implements OsmRelationInfo {
 
     @Override
     public long estimateMemoryUsageBytes() {
diff --git a/src/main/java/com/onthegomap/planetiler/basemap/layers/Place.java b/src/main/java/com/onthegomap/planetiler/basemap/layers/Place.java
index 4efe834..f4d3d70 100644
--- a/src/main/java/com/onthegomap/planetiler/basemap/layers/Place.java
+++ b/src/main/java/com/onthegomap/planetiler/basemap/layers/Place.java
@@ -412,7 +412,7 @@ public class Place implements
    * Information extracted from a natural earth geographic region that will be inspected when joining with OpenStreetMap
    * data.
    */
-  private static record NaturalEarthRegion(String name, int rank) {
+  private record NaturalEarthRegion(String name, int rank) {
 
     NaturalEarthRegion(String name, int maxRank, double... ranks) {
       this(name, (int) Math.ceil(DoubleStream.of(ranks).average().orElse(maxRank)));
@@ -423,6 +423,6 @@ public class Place implements
    * Information extracted from a natural earth place label that will be inspected when joining with OpenStreetMap
    * data.
    */
-  private static record NaturalEarthPoint(String name, String wikidata, int scaleRank, Set<String> names) {}
+  private record NaturalEarthPoint(String name, String wikidata, int scaleRank, Set<String> names) {}
 }