diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
index 608ba3449..371b6cdf6 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java
@@ -71,9 +71,6 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 public final class RS {
     public static final String ID = "refinedstorage";
 
-    public static RS INSTANCE;
-    public RSOldConfig config = new RSOldConfig();
-
     public static final NetworkHandler NETWORK_HANDLER = new NetworkHandler();
     public static final ItemGroup MAIN_GROUP = new MainItemGroup();
     public static final ServerConfig SERVER_CONFIG = new ServerConfig();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSOldConfig.java b/src/main/java/com/raoulvdberge/refinedstorage/RSOldConfig.java
deleted file mode 100644
index 17e4290e9..000000000
--- a/src/main/java/com/raoulvdberge/refinedstorage/RSOldConfig.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.raoulvdberge.refinedstorage;
-
-public class RSOldConfig {
-    //region Autocrafting
-    public int calculationTimeoutMs;
-    //endregion
-
-    //region Categories
-    private static final String AUTOCRAFTING = "autocrafting";
-    //endregion
-
-    /*private void loadConfig() {
-        //region Autocrafting
-        calculationTimeoutMs = config.getInt("calculationTimeoutMs", AUTOCRAFTING, 5000, 5000, Integer.MAX_VALUE, "The autocrafting calculation timeout in milliseconds, tasks taking longer than this to calculate (NOT execute) are cancelled to avoid server strain");
-        //endregion
-    }*/
-}
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
index 7f5042dd0..686da85b7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
@@ -1,6 +1,7 @@
 package com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task;
 
 import com.google.common.collect.Maps;
+import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.api.autocrafting.*;
 import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElement;
 import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList;
@@ -373,10 +374,9 @@ public class CraftingTask implements ICraftingTask {
         ICraftingPattern pattern,
         boolean root) {
 
-        /* TODO
-        if (System.currentTimeMillis() - calculationStarted > RS.INSTANCE.config.calculationTimeoutMs) {
+        if (System.currentTimeMillis() - calculationStarted > RS.SERVER_CONFIG.getAutocrafting().getCalculationTimeoutMs()) {
             return new CraftingTaskError(CraftingTaskErrorType.TOO_COMPLEX);
-        }*/
+        }
 
         if (!patternsUsed.add(pattern)) {
             return new CraftingTaskError(CraftingTaskErrorType.RECURSIVE, pattern);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/config/ServerConfig.java b/src/main/java/com/raoulvdberge/refinedstorage/config/ServerConfig.java
index f98333cab..cd7ea3d55 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/config/ServerConfig.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/config/ServerConfig.java
@@ -35,6 +35,7 @@ public class ServerConfig {
     private CrafterManager crafterManager;
     private CraftingMonitor craftingMonitor;
     private WirelessCraftingMonitor wirelessCraftingMonitor;
+    private Autocrafting autocrafting;
 
     public ServerConfig() {
         upgrades = new Upgrades();
@@ -66,6 +67,7 @@ public class ServerConfig {
         crafterManager = new CrafterManager();
         craftingMonitor = new CraftingMonitor();
         wirelessCraftingMonitor = new WirelessCraftingMonitor();
+        autocrafting = new Autocrafting();
 
         spec = builder.build();
     }
@@ -190,6 +192,10 @@ public class ServerConfig {
         return wirelessCraftingMonitor;
     }
 
+    public Autocrafting getAutocrafting() {
+        return autocrafting;
+    }
+
     public class Controller {
         private final ForgeConfigSpec.BooleanValue useEnergy;
         private final ForgeConfigSpec.IntValue capacity;
@@ -905,4 +911,20 @@ public class ServerConfig {
             return cancelAllUsage.get();
         }
     }
+
+    public class Autocrafting {
+        private final ForgeConfigSpec.IntValue calculationTimeoutMs;
+
+        public Autocrafting() {
+            builder.push("autocrafting");
+
+            calculationTimeoutMs = builder.comment("The autocrafting calculation timeout in milliseconds, crafting tasks taking longer than this to calculate are cancelled to avoid server strain").defineInRange("calculationTimeoutMs", 5000, 5000, Integer.MAX_VALUE);
+
+            builder.pop();
+        }
+
+        public int getCalculationTimeoutMs() {
+            return calculationTimeoutMs.get();
+        }
+    }
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/TEMPLATE.txt b/src/main/java/com/raoulvdberge/refinedstorage/network/TEMPLATE.txt
deleted file mode 100644
index 29621a63f..000000000
--- a/src/main/java/com/raoulvdberge/refinedstorage/network/TEMPLATE.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-    public static MessageXXX decode(PacketBuffer buf) {
-        return new MessageXXX(
-            buf.readInt(),
-            buf.readInt(),
-            buf.readBoolean(),
-            buf.readString(),
-            buf.readInt()
-        );
-    }
-
-    public static void encode(MessageXXX message, PacketBuffer buf) {
-        buf.writeInt(message.compare);
-        buf.writeInt(message.mode);
-        buf.writeBoolean(message.modFilter);
-        buf.writeString(message.name);
-        buf.writeInt(message.type);
-    }
-
-    public static void handle(MessageXXX message, Supplier<NetworkEvent.Context> ctx) {
-        ctx.get().enqueueWork(() -> {
-            // XXX
-        });
-        ctx.get().setPacketHandled(true);
-    }
\ No newline at end of file