diff --git a/src/main/java/com/apicatalog/cborld/decoder/value/DidKeyValueDecoder.java b/src/main/java/com/apicatalog/cborld/decoder/value/DidKeyValueDecoder.java
index 0b60b5c..5d5e7f3 100644
--- a/src/main/java/com/apicatalog/cborld/decoder/value/DidKeyValueDecoder.java
+++ b/src/main/java/com/apicatalog/cborld/decoder/value/DidKeyValueDecoder.java
@@ -52,7 +52,7 @@ public JsonValue decode(Mapping mapping, DataItem value, String term, Collection
         return null;
     }
 
-    private static final String decode(ByteString dataItem) throws DecoderError {
+    private static final String decode(ByteString dataItem) {
         return Multibase.BASE_58_BTC.encode(dataItem.getBytes());
     }
 }
diff --git a/src/main/java/com/apicatalog/cursor/cbor/CborArrayItemCursor.java b/src/main/java/com/apicatalog/cursor/cbor/CborArrayItemCursor.java
index ce1ced7..1205aca 100644
--- a/src/main/java/com/apicatalog/cursor/cbor/CborArrayItemCursor.java
+++ b/src/main/java/com/apicatalog/cursor/cbor/CborArrayItemCursor.java
@@ -16,7 +16,7 @@ public int arrayIndex() {
         if (!isArrayItem()) {
             throw new ClassCastException();    
         }        
-        return (Integer)cursor.index();
+        return cursor.index();
     }
 
     @Override
diff --git a/src/main/java11/com/apicatalog/cborld/decoder/value/XsdDateValueDecoder.java b/src/main/java11/com/apicatalog/cborld/decoder/value/XsdDateValueDecoder.java
deleted file mode 100644
index 7828279..0000000
--- a/src/main/java11/com/apicatalog/cborld/decoder/value/XsdDateValueDecoder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.apicatalog.cborld.decoder.value;
-
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.util.Collection;
-
-import com.apicatalog.cborld.decoder.DecoderError;
-import com.apicatalog.cborld.decoder.value.ValueDecoder;
-import com.apicatalog.cborld.dictionary.Dictionary;
-import com.apicatalog.cborld.mapping.Mapping;
-
-import co.nstant.in.cbor.model.DataItem;
-import co.nstant.in.cbor.model.MajorType;
-import co.nstant.in.cbor.model.UnsignedInteger;
-import jakarta.json.Json;
-import jakarta.json.JsonValue;
-
-public class XsdDateValueDecoder implements ValueDecoder {
-
-    @Override
-    public JsonValue decode(Mapping mapping, DataItem value, String term, Collection<String> types) throws DecoderError {
-        if (types != null && types.contains("http://www.w3.org/2001/XMLSchema#date")
-                && MajorType.UNSIGNED_INTEGER.equals(value.getMajorType())
-                ) {
-            
-            long epochSeconds = ((UnsignedInteger)value).getValue().longValueExact();
-            
-            final Instant date = Instant.ofEpochSecond(epochSeconds);
-            
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            
-            return Json.createValue(formatter.format(date.atZone(ZoneId.of("Z"))));            
-        }
-        return null;
-    }
-}
diff --git a/src/main/java11/com/apicatalog/cborld/encoder/value/XsdDateValueEncoder.java b/src/main/java11/com/apicatalog/cborld/encoder/value/XsdDateValueEncoder.java
deleted file mode 100644
index 4bbe5c2..0000000
--- a/src/main/java11/com/apicatalog/cborld/encoder/value/XsdDateValueEncoder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.apicatalog.cborld.encoder.value;
-
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.util.Collection;
-
-import com.apicatalog.cborld.mapping.Mapping;
-import com.apicatalog.cursor.ValueCursor;
-
-import co.nstant.in.cbor.model.DataItem;
-import co.nstant.in.cbor.model.UnsignedInteger;
-
-public class XsdDateValueEncoder implements ValueEncoder {
-
-    @Override
-    public DataItem encode(Mapping mapping, ValueCursor value, String term, Collection<String> types) {
-
-        if (types != null && types.contains("http://www.w3.org/2001/XMLSchema#date")
-                && value.isString()
-                ) {
-            
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            LocalDate date = LocalDate.parse(value.stringValue(), formatter);
-
-            return new UnsignedInteger(date.atStartOfDay(ZoneId.of("Z")).toEpochSecond());
-        }
-        return null;
-    }
-}
diff --git a/src/main/java11/com/apicatalog/cursor/cbor/CborCursorState.java b/src/main/java11/com/apicatalog/cursor/cbor/CborCursorState.java
deleted file mode 100644
index df3edf7..0000000
--- a/src/main/java11/com/apicatalog/cursor/cbor/CborCursorState.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.apicatalog.cursor.cbor;
-
-import co.nstant.in.cbor.model.DataItem;
-
-final class CborCursorState {
-
-    private final DataItem data;
-    private final Integer index;
-    private final String key;
-        
-    CborCursorState(
-            DataItem data,
-            Integer index,
-            String key
-            ) {
-        this.data = data;
-        this.index = index;
-        this.key = key;
-    }
-
-    public DataItem data() {
-        return data;
-    }
-    
-    public Integer index() {
-        return index;
-    }
-    
-    public String key() {
-        return key;
-    }    
-}
diff --git a/src/main/java11/com/apicatalog/cursor/jakarta/JakartaCursorState.java b/src/main/java11/com/apicatalog/cursor/jakarta/JakartaCursorState.java
deleted file mode 100644
index 9d35830..0000000
--- a/src/main/java11/com/apicatalog/cursor/jakarta/JakartaCursorState.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.apicatalog.cursor.jakarta;
-
-import jakarta.json.JsonValue;
-
-final class JakartaCursorState  {
-
-    private final JsonValue data;
-    private final Integer index;
-    private final String key;
-
-    JakartaCursorState(
-            JsonValue data,
-            Integer index,
-            String key
-            ) {
-        this.data = data;
-        this.index = index;
-        this.key = key;
-    }
-
-    public JsonValue data() {
-        return data;
-    }
-    
-    public Integer index() {
-        return index;
-    }
-    
-    public String key() {
-        return key;
-    }
-}
diff --git a/src/test/java/com/apicatalog/cborld/CborLdTestRunnerJunit.java b/src/test/java/com/apicatalog/cborld/CborLdTestRunnerJunit.java
index dd68a58..5037388 100644
--- a/src/test/java/com/apicatalog/cborld/CborLdTestRunnerJunit.java
+++ b/src/test/java/com/apicatalog/cborld/CborLdTestRunnerJunit.java
@@ -54,7 +54,7 @@ public class CborLdTestRunnerJunit {
         StaticContextLoader.set("https://w3id.org/age/v1", CborLdTestRunnerJunit.class, "age-v1.jsonld");
     }
 
-    public final static DocumentLoader LOADER = new UriBaseRewriter(
+    public static final DocumentLoader LOADER = new UriBaseRewriter(
             CborLdTest.BASE,
             "classpath:",
             new UriBaseRewriter("https://raw.githubusercontent.com/filip26/iridium-cbor-ld/main/src/test/resources/com/apicatalog/cborld/",