diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index cd19cae4..3fc3a6ff 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -18,10 +18,6 @@
     <module name="NewlineAtEndOfFile"> <!-- Java Style Guide: Line ending: LF -->
         <property name="lineSeparator" value="lf"/>
     </module>
-    <module name="RegexpHeader">
-        <property name="header" value="^/\*$\n^ \* \(c\) Copyright \d{4} Palantir Technologies Inc\. All rights reserved\.$"/>
-        <property name="fileExtensions" value=".java,.ts"/>
-    </module>
     <module name="RegexpMultiline"> <!-- Development Practices: Writing good unit tests -->
         <property name="fileExtensions" value="java"/>
         <property name="format" value="@VisibleForTesting\s+(protected|public)"/>
@@ -410,7 +406,6 @@
             <message key="name.invalidPattern" value="Type name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="TypecastParenPad"/> <!-- Java Style Guide: Horizontal whitespace -->
-        <module name="UnnecessaryParentheses"/>
         <module name="UnusedImports"> <!-- Java Style Guide: No unused imports -->
             <property name="processJavadoc" value="true"/>
         </module>
diff --git a/async-shuffle-upload-core/src/main/java/com/palantir/spark/shuffle/async/s3/reader/FallbackToS3ShuffleIterator.java b/async-shuffle-upload-core/src/main/java/com/palantir/spark/shuffle/async/s3/reader/FallbackToS3ShuffleIterator.java
index e0eb2ff2..73085846 100644
--- a/async-shuffle-upload-core/src/main/java/com/palantir/spark/shuffle/async/s3/reader/FallbackToS3ShuffleIterator.java
+++ b/async-shuffle-upload-core/src/main/java/com/palantir/spark/shuffle/async/s3/reader/FallbackToS3ShuffleIterator.java
@@ -49,7 +49,7 @@ public final class FallbackToS3ShuffleIterator implements Iterator<ShuffleBlockI
     private final boolean shouldCompressShuffle;
     private final SerializerManager serializerManager;
     private final CompressionCodec compressionCodec;
-    private final ShuffleDriverEndpointRef driverEndpointRef;
+
 
     public FallbackToS3ShuffleIterator(
             Iterator<ShuffleBlockInputStream> fetchFromExecutorsIterator,
@@ -75,7 +75,7 @@ public FallbackToS3ShuffleIterator(
         this.s3FetcherIterator = s3FetcherIterator;
         Preconditions.checkState(!s3FetcherIterator.isInitialized(),
                 "S3 Fetcher iterator already initialized");
-        this.driverEndpointRef = driverEndpointRef;
+
     }
 
     @Override
diff --git a/build.gradle b/build.gradle
index 4a6cb188..7518a73f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.40.1'
+        classpath 'com.palantir.baseline:gradle-baseline-java:3.5.1'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
         classpath 'com.palantir.sls-packaging:gradle-sls-packaging:4.3.3'
diff --git a/gradle.properties b/gradle.properties
index 8a30c841..7bb4839e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,5 +17,4 @@
 systemProp.org.gradle.internal.http.socketTimeout=600000
 systemProp.org.gradle.internal.http.connectionTimeout=600000
 org.gradle.parallel=true
-com.palantir.baseline-versions.disable=true
 org.gradle.caching = true