diff --git a/jgvariant-core/pom.xml b/jgvariant-core/pom.xml
index 6970f97..2dbbd23 100644
--- a/jgvariant-core/pom.xml
+++ b/jgvariant-core/pom.xml
@@ -40,11 +40,6 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
       <optional>true</optional>
diff --git a/jgvariant-core/src/main/java/module-info.java b/jgvariant-core/src/main/java/module-info.java
index c340c3e..d490200 100644
--- a/jgvariant-core/src/main/java/module-info.java
+++ b/jgvariant-core/src/main/java/module-info.java
@@ -85,7 +85,6 @@
 module eu.mulk.jgvariant.core {
   requires static com.google.errorprone.annotations;
   requires static org.apiguardian.api;
-  requires static org.jetbrains.annotations;
   requires static org.jspecify;
 
   exports eu.mulk.jgvariant.core;
diff --git a/jgvariant-ostree/pom.xml b/jgvariant-ostree/pom.xml
index a6a1d9e..985a619 100644
--- a/jgvariant-ostree/pom.xml
+++ b/jgvariant-ostree/pom.xml
@@ -47,11 +47,6 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
       <optional>true</optional>
diff --git a/jgvariant-ostree/src/main/java/module-info.java b/jgvariant-ostree/src/main/java/module-info.java
index 0ba7fb6..50324d8 100644
--- a/jgvariant-ostree/src/main/java/module-info.java
+++ b/jgvariant-ostree/src/main/java/module-info.java
@@ -88,7 +88,6 @@
 
   requires static com.google.errorprone.annotations;
   requires static org.apiguardian.api;
-  requires static org.jetbrains.annotations;
   requires static org.jspecify;
 
   exports eu.mulk.jgvariant.ostree;
diff --git a/jgvariant-parent/pom.xml b/jgvariant-parent/pom.xml
index f6c2e4c..d30879e 100644
--- a/jgvariant-parent/pom.xml
+++ b/jgvariant-parent/pom.xml
@@ -74,7 +74,6 @@
     <apiguardian.version>1.1.2</apiguardian.version>
     <errorprone.version>2.35.1</errorprone.version>
     <inject-resources.version>0.3.5</inject-resources.version>
-    <jetbrains-annotations.version>26.0.1</jetbrains-annotations.version>
     <jqwik.version>1.9.1</jqwik.version>
     <jspecify.version>1.0.0</jspecify.version>
     <junit-jupiter.version>5.11.3</junit-jupiter.version>
@@ -101,11 +100,6 @@
         <version>${errorprone.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.jetbrains</groupId>
-        <artifactId>annotations</artifactId>
-        <version>${jetbrains-annotations.version}</version>
-      </dependency>
-      <dependency>
         <groupId>org.jspecify</groupId>
         <artifactId>jspecify</artifactId>
         <version>${jspecify.version}</version>
diff --git a/jgvariant-tool/pom.xml b/jgvariant-tool/pom.xml
index 7e9568b..1bad291 100644
--- a/jgvariant-tool/pom.xml
+++ b/jgvariant-tool/pom.xml
@@ -53,12 +53,6 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
       <scope>provided</scope>
diff --git a/jgvariant-tool/src/main/java/eu/mulk/jgvariant/tool/MainCommand.java b/jgvariant-tool/src/main/java/eu/mulk/jgvariant/tool/MainCommand.java
index 9c3e0f9..dae5f19 100644
--- a/jgvariant-tool/src/main/java/eu/mulk/jgvariant/tool/MainCommand.java
+++ b/jgvariant-tool/src/main/java/eu/mulk/jgvariant/tool/MainCommand.java
@@ -29,7 +29,6 @@
 import java.util.*;
 import java.util.logging.Logger;
 import java.util.stream.IntStream;
-import org.jetbrains.annotations.VisibleForTesting;
 import org.jspecify.annotations.Nullable;
 import picocli.AutoComplete;
 import picocli.CommandLine;
@@ -172,7 +171,7 @@
 
     @Spec CommandLine.Model.CommandSpec spec;
 
-    @VisibleForTesting FileSystem fs = FileSystems.getDefault();
+    private final FileSystem fs = FileSystems.getDefault();
 
     protected BaseCommand() {}
 
diff --git a/jgvariant-tool/src/main/java/module-info.java b/jgvariant-tool/src/main/java/module-info.java
index c0f413d..82ec228 100644
--- a/jgvariant-tool/src/main/java/module-info.java
+++ b/jgvariant-tool/src/main/java/module-info.java
@@ -79,7 +79,6 @@
   requires java.logging;
   requires static com.google.errorprone.annotations;
   requires static org.apiguardian.api;
-  requires static org.jetbrains.annotations;
   requires static org.jspecify;
 
   opens eu.mulk.jgvariant.tool to