diff --git a/java/src/main/java/ai/onnxruntime/OnnxRuntime.java b/java/src/main/java/ai/onnxruntime/OnnxRuntime.java
index f28e376291..bee63f566d 100644
--- a/java/src/main/java/ai/onnxruntime/OnnxRuntime.java
+++ b/java/src/main/java/ai/onnxruntime/OnnxRuntime.java
@@ -99,7 +99,7 @@ final class OnnxRuntime {
       providers = initialiseProviders(ortApiHandle);
       loaded = true;
     } finally {
-      if (!isAndroid()) {
+      if (tempDirectory != null) {
         cleanUp(tempDirectory.toFile());
       }
     }
diff --git a/java/src/main/java/ai/onnxruntime/OnnxTensor.java b/java/src/main/java/ai/onnxruntime/OnnxTensor.java
index f345d5626d..d76ca07312 100644
--- a/java/src/main/java/ai/onnxruntime/OnnxTensor.java
+++ b/java/src/main/java/ai/onnxruntime/OnnxTensor.java
@@ -19,7 +19,6 @@ import java.nio.ShortBuffer;
  * returned as outputs.
  */
 public class OnnxTensor implements OnnxValue {
-
   static {
     try {
       OnnxRuntime.init();
@@ -558,7 +557,6 @@ public class OnnxTensor implements OnnxValue {
       OrtEnvironment env, OrtAllocator allocator, ByteBuffer data, long[] shape, OnnxJavaType type)
       throws OrtException {
     if ((!env.isClosed()) && (!allocator.isClosed())) {
-      int bufferSize = data.capacity();
       return createTensor(type, allocator, data, shape);
     } else {
       throw new IllegalStateException("Trying to create an OnnxTensor on a closed OrtAllocator.");