diff --git a/eco-api/src/main/java/com/willfp/eco/core/fast/FastItemStack.java b/eco-api/src/main/java/com/willfp/eco/core/fast/FastItemStack.java
index 9b7dbbdd..b4034706 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/fast/FastItemStack.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/fast/FastItemStack.java
@@ -29,12 +29,6 @@ public interface FastItemStack {
     int getLevelOnItem(@NotNull Enchantment enchantment,
                        boolean checkStored);
 
-    /**
-     * Get bukkit ItemStack again.
-     *
-     * @return The ItemStack.
-     */
-    ItemStack unwrap();
 
     /**
      * Wrap an ItemStack to create a FastItemStack.
diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/FastItemStackFactory.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/FastItemStackFactory.java
index 3889299b..ce260e38 100644
--- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/FastItemStackFactory.java
+++ b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/FastItemStackFactory.java
@@ -2,13 +2,13 @@ package com.willfp.eco.proxy.v1_16_R3;
 
 import com.willfp.eco.core.fast.FastItemStack;
 import com.willfp.eco.proxy.FastItemStackFactoryProxy;
-import com.willfp.eco.proxy.v1_16_R3.fast.NMSFastItemStack;
+import com.willfp.eco.proxy.v1_16_R3.fast.EcoFastItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 public final class FastItemStackFactory implements FastItemStackFactoryProxy {
     @Override
     public FastItemStack create(@NotNull final ItemStack itemStack) {
-        return new NMSFastItemStack(itemStack);
+        return new EcoFastItemStack(itemStack);
     }
 }
diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/fast/NMSFastItemStack.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/fast/EcoFastItemStack.java
similarity index 84%
rename from eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/fast/NMSFastItemStack.java
rename to eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/fast/EcoFastItemStack.java
index 8dcc768d..0f71f71e 100644
--- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/fast/NMSFastItemStack.java
+++ b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/fast/EcoFastItemStack.java
@@ -1,26 +1,23 @@
 package com.willfp.eco.proxy.v1_16_R3.fast;
 
 import com.willfp.eco.core.fast.FastItemStack;
-import net.minecraft.server.v1_16_R3.IChatBaseComponent;
 import net.minecraft.server.v1_16_R3.ItemEnchantedBook;
 import net.minecraft.server.v1_16_R3.ItemStack;
 import net.minecraft.server.v1_16_R3.Items;
 import net.minecraft.server.v1_16_R3.NBTBase;
 import net.minecraft.server.v1_16_R3.NBTTagCompound;
 import net.minecraft.server.v1_16_R3.NBTTagList;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.v1_16_R3.util.CraftNamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-public class NMSFastItemStack implements FastItemStack {
+public class EcoFastItemStack implements FastItemStack {
     private final ItemStack handle;
 
-    public NMSFastItemStack(@NotNull final org.bukkit.inventory.ItemStack itemStack) {
+    public EcoFastItemStack(@NotNull final org.bukkit.inventory.ItemStack itemStack) {
         this.handle = FastItemStackUtils.getNMSStack(itemStack);
     }
 
@@ -58,8 +55,4 @@ public class NMSFastItemStack implements FastItemStack {
         }
         return 0;
     }
-    @Override
-    public org.bukkit.inventory.ItemStack unwrap() {
-        return CraftItemStack.asCraftMirror(handle);
-    }
 }
diff --git a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.java b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.java
index bc9fbd04..0d9475fc 100644
--- a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.java
+++ b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.java
@@ -2,13 +2,13 @@ package com.willfp.eco.proxy.v1_17_R1;
 
 import com.willfp.eco.core.fast.FastItemStack;
 import com.willfp.eco.proxy.FastItemStackFactoryProxy;
-import com.willfp.eco.proxy.v1_17_R1.fast.NMSFastItemStack;
+import com.willfp.eco.proxy.v1_17_R1.fast.EcoFastItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
 public final class FastItemStackFactory implements FastItemStackFactoryProxy {
     @Override
     public FastItemStack create(@NotNull final ItemStack itemStack) {
-        return new NMSFastItemStack(itemStack);
+        return new EcoFastItemStack(itemStack);
     }
 }
diff --git a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/fast/NMSFastItemStack.java b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/fast/EcoFastItemStack.java
similarity index 87%
rename from eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/fast/NMSFastItemStack.java
rename to eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/fast/EcoFastItemStack.java
index 930db2d2..46b3f43b 100644
--- a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/fast/NMSFastItemStack.java
+++ b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/fast/EcoFastItemStack.java
@@ -7,7 +7,6 @@ import net.minecraft.nbt.Tag;
 import net.minecraft.world.item.EnchantedBookItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.v1_17_R1.util.CraftNamespacedKey;
 import org.bukkit.enchantments.Enchantment;
 import org.jetbrains.annotations.NotNull;
@@ -15,10 +14,10 @@ import org.jetbrains.annotations.NotNull;
 import java.util.HashMap;
 import java.util.Map;
 
-public class NMSFastItemStack implements FastItemStack {
+public class EcoFastItemStack implements FastItemStack {
     private final ItemStack handle;
 
-    public NMSFastItemStack(@NotNull final org.bukkit.inventory.ItemStack itemStack) {
+    public EcoFastItemStack(@NotNull final org.bukkit.inventory.ItemStack itemStack) {
         this.handle = FastItemStackUtils.getNMSStack(itemStack);
     }
 
@@ -56,9 +55,4 @@ public class NMSFastItemStack implements FastItemStack {
         }
         return 0;
     }
-
-    @Override
-    public org.bukkit.inventory.ItemStack unwrap() {
-        return CraftItemStack.asCraftMirror(handle);
-    }
 }