diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/AbstractInputData.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/AbstractInputData.java
index faef8b8..3ef1ee0 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/AbstractInputData.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/AbstractInputData.java
@@ -2,7 +2,7 @@ package org.insa.graphs.algorithm;
 
 import org.insa.graphs.model.Arc;
 import org.insa.graphs.model.Graph;
-import org.insa.graphs.model.GraphStatistics;
+//import org.insa.graphs.model.GraphStatistics;
 
 /**
  * Base class for algorithm input data classes. This class contains the basic
diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspector.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspector.java
index f8e3fc0..57010bd 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspector.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspector.java
@@ -2,7 +2,7 @@ package org.insa.graphs.algorithm;
 
 import org.insa.graphs.algorithm.AbstractInputData.Mode;
 import org.insa.graphs.model.Arc;
-import org.insa.graphs.model.GraphStatistics;
+//import org.insa.graphs.model.GraphStatistics;
 
 /**
  * This class can be used to indicate to an algorithm which arcs can be used and
@@ -40,4 +40,4 @@ public interface ArcInspector {
      */
     public Mode getMode();
 
-}
\ No newline at end of file
+}
diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspectorFactory.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspectorFactory.java
index b9b6a7a..ab42c7d 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspectorFactory.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/ArcInspectorFactory.java
@@ -6,7 +6,7 @@ import java.util.List;
 
 import org.insa.graphs.algorithm.AbstractInputData.Mode;
 import org.insa.graphs.model.Arc;
-import org.insa.graphs.model.GraphStatistics;
+//import org.insa.graphs.model.GraphStatistics;
 import org.insa.graphs.model.AccessRestrictions.AccessMode;
 import org.insa.graphs.model.AccessRestrictions.AccessRestriction;
 
diff --git a/be-graphes-model/src/main/java/org/insa/graphs/model/io/BinaryReader.java b/be-graphes-model/src/main/java/org/insa/graphs/model/io/BinaryReader.java
index b654bad..f0bd8d8 100644
--- a/be-graphes-model/src/main/java/org/insa/graphs/model/io/BinaryReader.java
+++ b/be-graphes-model/src/main/java/org/insa/graphs/model/io/BinaryReader.java
@@ -8,7 +8,7 @@ import java.io.IOException;
  * Base class for writing binary file.
  *
  */
-public abstract class BinaryReader implements AutoCloseable, Closeable {
+public abstract class BinaryReader implements Closeable {
 
     // Map version and magic number targeted for this reader.
     private final int minVersion;
diff --git a/be-graphes-model/src/main/java/org/insa/graphs/model/io/BinaryWriter.java b/be-graphes-model/src/main/java/org/insa/graphs/model/io/BinaryWriter.java
index 34cad06..1f04763 100644
--- a/be-graphes-model/src/main/java/org/insa/graphs/model/io/BinaryWriter.java
+++ b/be-graphes-model/src/main/java/org/insa/graphs/model/io/BinaryWriter.java
@@ -8,7 +8,7 @@ import java.io.IOException;
  * Base class for writing binary file.
  *
  */
-public abstract class BinaryWriter implements AutoCloseable, Closeable {
+public abstract class BinaryWriter implements Closeable {
 
     // Output stream.
     protected final DataOutputStream dos;
diff --git a/be-graphes-model/src/main/java/org/insa/graphs/model/io/GraphReader.java b/be-graphes-model/src/main/java/org/insa/graphs/model/io/GraphReader.java
index 29ed437..d99b6cf 100644
--- a/be-graphes-model/src/main/java/org/insa/graphs/model/io/GraphReader.java
+++ b/be-graphes-model/src/main/java/org/insa/graphs/model/io/GraphReader.java
@@ -9,7 +9,7 @@ import org.insa.graphs.model.Graph;
  * Base interface for classes that can read graph.
  *
  */
-public interface GraphReader extends AutoCloseable, Closeable {
+public interface GraphReader extends Closeable {
 
     /**
      * Add a new observer to this graph reader.
diff --git a/be-graphes-model/src/main/java/org/insa/graphs/model/io/PathReader.java b/be-graphes-model/src/main/java/org/insa/graphs/model/io/PathReader.java
index e14a5a2..b08747c 100644
--- a/be-graphes-model/src/main/java/org/insa/graphs/model/io/PathReader.java
+++ b/be-graphes-model/src/main/java/org/insa/graphs/model/io/PathReader.java
@@ -10,7 +10,7 @@ import org.insa.graphs.model.Path;
  * Base interface that should be implemented by class used to read paths.
  *
  */
-public interface PathReader extends AutoCloseable, Closeable {
+public interface PathReader extends Closeable {
 
     /**
      * Read a path of the given graph and returns it.
diff --git a/be-graphes-model/src/main/java/org/insa/graphs/model/io/PathWriter.java b/be-graphes-model/src/main/java/org/insa/graphs/model/io/PathWriter.java
index b261763..cb901c6 100644
--- a/be-graphes-model/src/main/java/org/insa/graphs/model/io/PathWriter.java
+++ b/be-graphes-model/src/main/java/org/insa/graphs/model/io/PathWriter.java
@@ -9,7 +9,7 @@ import org.insa.graphs.model.Path;
  * Base interface that should be implemented by class used to write paths.
  *
  */
-public interface PathWriter extends AutoCloseable, Closeable {
+public interface PathWriter extends Closeable {
 
     /**
      * Write the given path.