diff --git a/BauSystem/BauSystem_Main/build.gradle.kts b/BauSystem/BauSystem_Main/build.gradle.kts
index 9ae53822..8f46699d 100644
--- a/BauSystem/BauSystem_Main/build.gradle.kts
+++ b/BauSystem/BauSystem_Main/build.gradle.kts
@@ -35,12 +35,7 @@ dependencies {
     annotationProcessor(libs.classindex)
     compileOnly(project(":SpigotCore", "default"))
 
-    compileOnly(libs.paperapi21) {
-        attributes {
-            // Very Hacky, but it works
-            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
-        }
-    }
+    compileOnly(libs.spigotapi)
     compileOnly(libs.axiom)
     compileOnly(libs.authlib)
     compileOnly(libs.viaapi)
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java
index 7aee66a0..82c8dabb 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/base/SimulatorBaseGui.java
@@ -70,7 +70,7 @@ public abstract class SimulatorBaseGui {
             return;
         }
 
-        TrickyTrialsWrapper.impl.closeInventoryView(player.getOpenInventory());
+        player.closeInventory();
 
         inventory = new SWInventory(player, () -> {
             inv = Bukkit.createInventory(null, size, title());
diff --git a/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java b/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java
index 840c4cad..32932a25 100644
--- a/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java
+++ b/SpigotCore/SpigotCore_21/src/de/steamwar/core/TrickyTrialsWrapper21.java
@@ -20,7 +20,6 @@
 package de.steamwar.core;
 
 import org.bukkit.Material;
-import org.bukkit.Particle;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.InventoryView;
@@ -45,9 +44,4 @@ public class TrickyTrialsWrapper21 implements TrickyTrialsWrapper {
     public String getInventoryTitle(InventoryView view) {
         return view.getTitle();
     }
-
-    @Override
-    public void closeInventoryView(InventoryView view) {
-        view.close();
-    }
 }
diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java
index 02d8febf..da8fc7cd 100644
--- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java
+++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TrickyTrialsWrapper.java
@@ -34,6 +34,4 @@ public interface TrickyTrialsWrapper {
     Material getTurtleScute();
 
     String getInventoryTitle(InventoryView view);
-
-    void closeInventoryView(InventoryView view);
 }