diff --git a/src/main/java/org/mariadb/jdbc/Driver.java b/src/main/java/org/mariadb/jdbc/Driver.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/mariadb/jdbc/Driver.java
+++ b/src/main/java/org/mariadb/jdbc/Driver.java
@@ -182,4 +182,13 @@ public final class Driver implements java.sql.Driver {
 		// TODO Auto-generated method stub
 		return null;
 	}
+
+    /*
+        Provide a "cleanup" method that can be called after unloading driver, to fix Tomcat's obscure classpath handling.
+
+        See CONJ-61.
+     */
+    public static void unloadDriver() {
+        MySQLStatement.unloadDriver();
+    }
 }
diff --git a/src/main/java/org/mariadb/jdbc/MySQLStatement.java b/src/main/java/org/mariadb/jdbc/MySQLStatement.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/mariadb/jdbc/MySQLStatement.java
+++ b/src/main/java/org/mariadb/jdbc/MySQLStatement.java
@@ -1212,4 +1212,9 @@ public class MySQLStatement implements Statement {
 		// TODO Auto-generated method stub
 		return false;
 	}
+
+    public static void unloadDriver() {
+        if (timer != null)
+            timer.cancel();
+    }
 }
CONJ-<I>  - provide public method to cleanup after driver unload, to workaround Tomcat's classloading issues.