diff --git a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
index becf54b..10bd696 100644
--- a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
+++ b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
@@ -25,7 +25,6 @@ import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
 import nl.requios.effortlessbuilding.command.CommandReach;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.gui.RandomizerBagGuiHandler;
-import nl.requios.effortlessbuilding.helper.ReachConditionFactory;
 import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 import nl.requios.effortlessbuilding.item.ItemReachUpgrade1;
 import nl.requios.effortlessbuilding.item.ItemReachUpgrade2;
@@ -44,7 +43,7 @@ public class EffortlessBuilding
 {
     public static final String MODID = "effortlessbuilding";
     public static final String NAME = "Effortless Building";
-    public static final String VERSION = "1.13.2-2.16";
+    public static final String VERSION = "1.14.4-2.16";
 
     public static EffortlessBuilding instance;
 
@@ -96,9 +95,6 @@ public class EffortlessBuilding
 
         PacketHandler.register();
 
-        //Register recipe condition
-        CraftingHelper.register(new ResourceLocation(MODID, "enable_reach_upgrades"), new ReachConditionFactory());
-
         //TODO 1.13 config
 //        ConfigManager.sync(MODID, Config.Type.INSTANCE);
 
diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java
index 368ebb6..78f23ce 100644
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java
@@ -114,7 +114,7 @@ public class ModifierSettingsGui extends Screen {
     }
 
     @Override
-    public void onClose() {
+    public void removed() {
         scrollPane.onGuiClosed();
 
         //save everything
diff --git a/src/main/java/nl/requios/effortlessbuilding/helper/ReachConditionFactory.java b/src/main/java/nl/requios/effortlessbuilding/helper/ReachConditionFactory.java
deleted file mode 100644
index 67d7e8e..0000000
--- a/src/main/java/nl/requios/effortlessbuilding/helper/ReachConditionFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package nl.requios.effortlessbuilding.helper;
-
-import com.google.gson.JsonObject;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.common.crafting.IIngredientSerializer;
-import nl.requios.effortlessbuilding.BuildConfig;
-
-public class ReachConditionFactory implements IIngredientSerializer {
-    @Override
-    public Ingredient parse(PacketBuffer buffer) {
-        if (BuildConfig.reach.enableReachUpgrades.get())
-            return Ingredient.read(buffer);
-        return Ingredient.EMPTY;
-    }
-
-    @Override
-    public Ingredient parse(JsonObject json) {
-        if (BuildConfig.reach.enableReachUpgrades.get())
-            return Ingredient.deserialize(json);
-        return Ingredient.EMPTY;
-    }
-
-    @Override
-    public void write(PacketBuffer buffer, Ingredient ingredient) {
-        ingredient.write(buffer);
-    }
-}
diff --git a/src/main/resources/data/effortlessbuilding/recipes/_factories.json b/src/main/resources/data/effortlessbuilding/recipes/_factories.json
deleted file mode 100644
index a73dc42..0000000
--- a/src/main/resources/data/effortlessbuilding/recipes/_factories.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "conditions": {
-        "enable_reach_upgrades": "nl.requios.effortlessbuilding.helper.ReachConditionFactory"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade1.json b/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade1.json
index 6a36a56..680ec04 100644
--- a/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade1.json
+++ b/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade1.json
@@ -1,7 +1,4 @@
 {
-    "conditions": [{
-        "type": "effortlessbuilding:enable_reach_upgrades"
-    }],
     "type": "minecraft:crafting_shaped",
     "pattern": [
         " S",
diff --git a/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade2.json b/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade2.json
index 19e1a55..c70782a 100644
--- a/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade2.json
+++ b/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade2.json
@@ -1,7 +1,4 @@
 {
-    "conditions": [{
-        "type": "effortlessbuilding:enable_reach_upgrades"
-    }],
     "type": "minecraft:crafting_shaped",
     "pattern": [
         " M",
diff --git a/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade3.json b/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade3.json
index 7d5deb2..65bd73a 100644
--- a/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade3.json
+++ b/src/main/resources/data/effortlessbuilding/recipes/reach_upgrade3.json
@@ -1,7 +1,4 @@
 {
-    "conditions": [{
-        "type": "effortlessbuilding:enable_reach_upgrades"
-    }],
     "type": "minecraft:crafting_shaped",
     "pattern": [
         " FE",