diff --git a/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java b/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java
index d659539433..254bfb2d3a 100644
--- a/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java
+++ b/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java
@@ -1626,7 +1626,6 @@ public void setAdaptiveFetchMinimum(int adaptiveFetchMinimum) {
     PGProperty.ADAPTIVE_FETCH_MINIMUM.set(properties, adaptiveFetchMinimum);
   }
 
-  //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.1"
   @Override
   public java.util.logging.Logger getParentLogger() {
     return Logger.getLogger("org.postgresql");
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/CopyLargeFileTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/CopyLargeFileTest.java
index 60089eb74f..83ea255b87 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/CopyLargeFileTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/CopyLargeFileTest.java
@@ -102,25 +102,12 @@ private void feedTableAndCheckTableFeedIsOk(Connection conn) throws Throwable {
     } catch (Throwable t) {
       String message = "Using seed = " + seed + " for StrangeInputStream. Set -DStrangeInputStream.seed="
           + seed + " to reproduce the test";
-      //#if mvn.project.property.postgresql.jdbc.spec >= "JDBC4.1"
       t.addSuppressed(new Throwable(message) {
         @Override
         public synchronized Throwable fillInStackTrace() {
           return this;
         }
       });
-      //#else
-      if (t.getCause() != null) {
-        System.err.println(message);
-      } else {
-        t.initCause(new Throwable(message) {
-          @Override
-          public synchronized Throwable fillInStackTrace() {
-            return this;
-          }
-        });
-      }
-      //#endif
     } finally {
       if (in != null) {
         in.close();