diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java
index fa47d45..63f58e2 100644
--- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java
+++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java
@@ -123,6 +123,9 @@ public class BukkitPluginManager extends AbstractPluginManager<Plugin, BukkitPlu
             String pluginId = getPluginId(plugin);
             Bukkit.getPluginManager().callEvent(new BukkitPluginUnloadEvent(plugin, PluginEvent.Stage.PRE));
 
+            RCraftingManager.removeRecipesFor(plugin);
+            unregisterCommands(plugin);
+
             List<Closeable> closeables = new ArrayList<>();
             try {
                 RSimplePluginManager.getPlugins(Bukkit.getPluginManager()).remove(plugin);