diff --git a/pom.xml b/pom.xml
index 1eef89d..b4bc9ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openjump</groupId>
     <artifactId>dxf-driver</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0</version>
     <name>dxf-driver</name>
     <description>Driver for dxf file format</description>
 
@@ -16,45 +16,31 @@
         <jts.version>1.18.1</jts.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>ojrepo</id>
+            <name>OpenJUMP Snapshot Repository</name>
+            <url>https://ojrepo.soldin.de/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
+        <dependency>
+            <groupId>org.openjump</groupId>
+            <artifactId>OpenJUMP</artifactId>
+            <version>2.0-main-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.locationtech.jts</groupId>
             <artifactId>jts-core</artifactId>
             <version>${jts.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.openjump</groupId>
-            <artifactId>OpenJUMP</artifactId>
-            <version>2.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/OpenJUMP-20210412-b68329e.jar</systemPath>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
-        <!--dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <version>1.20</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-            <scope>test</scope>
-        </dependency-->
     </dependencies>
 
-    <!--repositories>
-        <repository>
-            <name>Redhat EA Repository</name>
-            <id>jboss-earlyaccess-repository</id>
-            <url>https://maven.repository.redhat.com/earlyaccess/all/</url>
-        </repository>
-    </repositories-->
-
 </project>
\ No newline at end of file
diff --git a/src/main/java/fr/michaelm/jump/drivers/dxf/DXFDriverConfiguration.java b/src/main/java/fr/michaelm/jump/drivers/dxf/DXFDriverConfiguration.java
index cceb39f..23e315d 100644
--- a/src/main/java/fr/michaelm/jump/drivers/dxf/DXFDriverConfiguration.java
+++ b/src/main/java/fr/michaelm/jump/drivers/dxf/DXFDriverConfiguration.java
@@ -36,6 +36,7 @@ import com.vividsolutions.jump.workbench.plugin.PlugInContext;
  * @version 1.0.0
  */
 // History
+// 2.0.0 (2021-08-22) : * version number alignment with OpenJUMP's
 // 1.0.0 (2021-04-11) : * refactoring for OpenJUMP 2, JTS 1.18
 // 0.9.0 (2018-06-02) : * fix a regression preventing export of MultiPolygons
 //                      * use java 5 features (foreach, autoboxing, generics...)
@@ -83,6 +84,6 @@ public class DXFDriverConfiguration extends Extension {
 
     public String getName() {return "DXF driver";}
 
-    public String getVersion() {return "1.0.0 (2021-04-11)";}
+    public String getVersion() {return "2.0.0 (2021-08-22)";}
 
 }
diff --git a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfBLOCKS.java b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfBLOCKS.java
index edde43f..3c67e55 100644
--- a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfBLOCKS.java
+++ b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfBLOCKS.java
@@ -36,7 +36,6 @@ import com.vividsolutions.jump.feature.FeatureDataset;
  * block.
  * @author Michaël Michaud
  */
-// History
 public class DxfBLOCKS {
 
     FeatureCollection entities;
diff --git a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfENTITY.java b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfENTITY.java
index 232dc7e..c207b9f 100644
--- a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfENTITY.java
+++ b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfENTITY.java
@@ -66,13 +66,6 @@ public class DxfENTITY {
     public static int precision = 4;
 
     private String layerName = "DEFAULT";
-    //private String lineType = null;
-    //private float elevation = 0f;
-    //private float thickness = 0f;
-    //private int colorNumber = 256;
-    //private int space = 0;
-    //private double[] extrusionDirection = null;
-    //private int flags = 0;
 
     public String getLayerName() {return layerName;}
 
diff --git a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfFile.java b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfFile.java
index e0c6e9c..1d86922 100644
--- a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfFile.java
+++ b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfFile.java
@@ -66,7 +66,7 @@ public class DxfFile {
     // Common FeatureSchema for ENTITIES
     public final static FeatureSchema DXF_SCHEMA = new FeatureSchema();
     public static boolean DXF_SCHEMA_INITIALIZED = false;
-    //static int iterator = 0;
+
     private DxfHEADER header = null;
     private DxfCLASSES classes = null;
     private DxfTABLES tables = null;
diff --git a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_APPID_ITEM.java b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_APPID_ITEM.java
index d19600b..42f0ce6 100644
--- a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_APPID_ITEM.java
+++ b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_APPID_ITEM.java
@@ -46,7 +46,6 @@ public class DxfTABLE_APPID_ITEM extends DxfTABLE_ITEM {
         Map<String,DxfTABLE_ITEM> table  = new LinkedHashMap<>();
         DxfGroup group;
         while (null != (group = DxfGroup.readGroup(raf)) && !group.equals(ENDTAB)) {
-            //group = DxfGroup.readGroup(raf);
             if (DxfFile.DEBUG) group.print(8);
             if (group.equals(APPID)) {
                 item = new DxfTABLE_APPID_ITEM("DEFAULT", 0);
diff --git a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_LAYER_ITEM.java b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_LAYER_ITEM.java
index 9ef9a6a..4102ece 100644
--- a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_LAYER_ITEM.java
+++ b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_LAYER_ITEM.java
@@ -71,7 +71,6 @@ public class DxfTABLE_LAYER_ITEM extends DxfTABLE_ITEM {
                 item = new DxfTABLE_LAYER_ITEM("DEFAULT", 0);
             }
             else if (group.getCode()==2) {
-                //System.out.println("\t\t" + group.getValue());
                 item.setName(group.getValue());
                 table.put(item.getName(), item);
             }
diff --git a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_UCS_ITEM.java b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_UCS_ITEM.java
index 83137ac..b0ea41f 100644
--- a/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_UCS_ITEM.java
+++ b/src/main/java/fr/michaelm/jump/drivers/dxf/DxfTABLE_UCS_ITEM.java
@@ -94,7 +94,6 @@ public class DxfTABLE_UCS_ITEM extends DxfTABLE_ITEM {
         Map<String,DxfTABLE_ITEM> table  = new LinkedHashMap<>();
         DxfGroup group;
         while (null != (group = DxfGroup.readGroup(raf)) && !group.equals(ENDTAB)) {
-            //group = DxfGroup.readGroup(raf);
             if (DxfFile.DEBUG) group.print(8);
             if (group.equals(UCS)) {
                 item = new DxfTABLE_UCS_ITEM("DEFAULT", 0);