Clean-up v2 (#729)

* Remove test items from NEI with no texture

* Add number formatting to hand pumps

* Remove heavy plates (no recipes & completely unused).

* Remove helium generator (no texture, no recipe)

* Remove fire pit and fire starter (no use, no recipe, no textures)

* Remove giant chicken and associated unused stuff, has no texture and is unobtainable. Used to be relevant but isn't anymore.

* Remove villagers with silly trades like 1 motor + 1 hull = 1 hull. Why?

* Remove trade bench, no recipe, missing textures. Unused.

* Remove farm processors, no texture, no recipe. Unused.

* Remove MAX tier components, these exist in GT now, have no recipe here and are unused.

* Hide untextured light block from NEI

* Update buildscript

* Remove unused backpacks, no recipe and contains dupe bugs. Bad.

* Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable.

* Remove eatotronic, universal toolbox and magic tool bag. All 3 are missing textures and uncraftable. part 2

* Remove dragon catcher (what?), no texture, no recipe, unused.

* Remove empty item, does nothing, has no recipe, no idea why it is here.

* Empty item v2 removal

* Revert "Empty item v2 removal"

This reverts commit 75bcd3ccfaf55bbfe2c12b2e4167d5c37636030d.

* Revert "Remove empty item, does nothing, has no recipe, no idea why it is here."

This reverts commit e41a9f484392776331c58530ab1faa5ef978ef36.

* Remove debug square. No recipe, unused.

* Number formatting overflow covers

* Remove JVM garbage collection block. Unused, no recipe.

* Remove nanotubes, no recipe for them. Unused.

* Remove "git" item, doesn't seem to work. Has no recipe.

* Remove uncraftable food with awful textures.

* Remove "bat king" mob, unused content. Does not spawn.

* Remove uncraftable doors with bad textures. Unused content.

* Remove uncraftable, unlocalised redstone stuff that crashes game when placed.

* Remove weird spawner item. No recipe, does not exist in world.

* Remove sunnarium bit, no recipe, no usage.

* Remove unused modularity table and some misc uncraftable, unused items.

* Remove Interconnecting Storage Crate, no recipe, unused.

* Delete worse debug power gen, this already exists as part of GT. Unneeded duplication.

* Delete unused placeholder circuit

* Delete uncraftable generator hatches.

* Spotless

* Remove XP tank thing, unused and uncraftable.

* Remove null item, this fluid registry only seemed to register one null fluid. All others exist?

* Remove EU -> RF battery. Unused in GTNH.

* Remove some shelf nonsense, why is this in this mod?

* Remove some weird random tools. These have no realistic usage in GTNH.

* Remove firemaker. Useless in GTNH.

* Removed helium blob. Deprecated item, not used anymore, uncraftable.

* spotlessApply (#730)

Co-authored-by: GitHub GTNH Actions <>

* Stop modulators generating unused blocks with no textures

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove more unused untextured casings

* Remove some weird methods and uncraftable mining parts, probably part of deprecated multiblock.

* spotlessApply (#732)

Co-authored-by: GitHub GTNH Actions <>

* Remove gem shards, unused.

* Remove unused atoms

* Remove unused gum

* Remove unused elements/materials

* Bye bye

* Remove some unused reflection stuff

* Remove control cores, obsolete now.

* Remove mob killing thing with no texture and no recipe.

* Remove uncraftable covers

* Remove pizza gloves

* Net and rope removal, unused

* Remove force crop

* Removal of some old event stuff

* Remove unused nuclear chem items

* Remove player safe, mostly because of the horrible event code that was intercepting every block break. I can't see any real usage of this via discord.

* Remove Force material and associated other nonsense. Also remove some nuclear chem stuff.

* Remove force for realsies

* Skookum Chooker purge.

* Remove some enderio compat, these plates/dusts are added via GT5 anyway now. This is obsolete.

* spotlessApply (#733)

Co-authored-by: GitHub GTNH Actions <>

* Unused textures

* Bump dep

* Revert "Remove force for realsies"

This reverts commit 0d288912a99f9dabce56d2a2623d4d3510f4804e.

* Revert "Remove Force material and associated other nonsense. Also remove some nuclear chem stuff."

This reverts commit 3455e6e916defe1f2aef923be6f9696a6cf3095b.

* Remove nuclear items that are unused

* spotlessApply (#734)

Co-authored-by: GitHub GTNH Actions <>

---------

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Connor Colenso <colen@CONNORSPC>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

6 files changed, 1 insertions, 235 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
index bc03c53089..19f6f42f64 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java
@@ -18,12 +18,6 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_R
 import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneStrengthScale;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_AdvancedCraftingTable;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_BronzeCraftingTable;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_Compartment;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_Desk;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_FileCabinet;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_Iron;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.GT4Entity_Shelf_Large;
 
 public class Gregtech4Content {
 
@@ -35,7 +29,6 @@ public class Gregtech4Content {
         thermalBoiler();
         multiCrafter();
         tesseracts();
-        shelves();
         basic();
         automation();
         redstone();
@@ -160,37 +153,6 @@ public class Gregtech4Content {
                         .getStackForm(1L));
     }
 
-    private static void shelves() {
-        // Gregtech 4 Shelves
-        Logger.INFO("Gregtech 4 Content | Registering Shelves.");
-        GregtechItemList.GT4_Shelf.set(
-                new GT4Entity_Shelf(870, "gtplusplus.shelf.wooden", "Wooden Shelf", "Usually used for books")
-                        .getStackForm(1L));
-        GregtechItemList.GT4_Shelf_Iron.set(
-                new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal Shelf", "A heavy duty shelf")
-                        .getStackForm(1L));
-        GregtechItemList.GT4_Shelf_FileCabinet.set(
-                new GT4Entity_Shelf_FileCabinet(
-                        872,
-                        "gtplusplus.shelf.filecabinet",
-                        "File Cabinet",
-                        "Could look nice in your office").getStackForm(1L));
-        GregtechItemList.GT4_Shelf_Desk.set(
-                new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk", "A place to study")
-                        .getStackForm(1L));
-        GregtechItemList.GT4_Shelf_Compartment.set(
-                new GT4Entity_Shelf_Compartment(
-                        874,
-                        "gtplusplus.shelf.compartment",
-                        "Compartment",
-                        "Stores Books & Things").getStackForm(1L));
-
-        // Custom Storage
-        GregtechItemList.GT4_Shelf_Large.set(
-                new GT4Entity_Shelf_Large(966, "gtplusplus.shelf.large", "Large Shelf", "A spacious shelf", 2048)
-                        .getStackForm(1L));
-    }
-
     private static void thermalBoiler() {
         // Gregtech 4 Thermal Boiler
         if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index 25694ac385..6c05c6e79f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -192,17 +192,11 @@ public class GregtechConduits {
 
     private static void run1() {
 
-        if (EnderIO.isModLoaded()) {
-            wireFactory("RedstoneAlloy", 32, BaseWireID + 45, 0, 2, 1, new short[] { 178, 34, 34, 0 });
-        }
+        wireFactory("RedstoneAlloy", 32, BaseWireID + 45, 0, 2, 1, new short[] { 178, 34, 34, 0 });
 
         // need to go back id because fluid pipes already occupy
         makeCustomWires(ELEMENT.STANDALONE.HYPOGEN, BaseWireID - 15, 0, 0, 8, GT_Values.V[11], false, true);
 
-        // superConductorFactory(GT_Materials.Superconductor, 524288, 30660, 0, 0, 8);
-        if (Thaumcraft.isModLoaded()) {
-            // superConductorFactory(GT_Materials.Void, 512, 30661, 0, 0, 8);
-        }
     }
 
     private static void run2() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
index da757cf677..7878709095 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java
@@ -8,8 +8,6 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ChiselBus;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake_Extreme;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ControlCore;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy_RTG;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler_Adv;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Naquadah;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Reservoir;
@@ -27,7 +25,6 @@ public class GregtechCustomHatches {
             run2();
         }
         run3();
-        run4();
         run5(); // Chisel buses
     }
 
@@ -73,11 +70,6 @@ public class GregtechCustomHatches {
                         "Turbine Housing", // Local name
                         8).getStackForm(1L));
 
-        // Multiblock Control Core Bus
-        GregtechItemList.Hatch_Control_Core.set(
-                (new GT_MetaTileEntity_Hatch_ControlCore(30020, "hatch.control.adv", "Control Core Module", 1))
-                        .getStackForm(1L));
-
         // Multiblock Air Intake Hatch
         GregtechItemList.Hatch_Air_Intake.set(
                 new GT_MetaTileEntity_Hatch_AirIntake(861, "hatch.air.intake.tier.00", "Air Intake Hatch", 5)
@@ -250,33 +242,6 @@ public class GregtechCustomHatches {
         return new GT_MetaTileEntity_SuperBus_Output(id, unlocalizedName, localizedName, tier);
     }
 
-    private static void run4() {
-        int aID = 31060;
-        // 41, "hatch.energy.tier.01", "LV Energy Hatch", 1
-        GT_MetaTileEntity_Hatch_Energy_RTG aHatch1 = new GT_MetaTileEntity_Hatch_Energy_RTG(
-                aID++,
-                "hatch.energy.rtg.tier.01",
-                "RTG Power Unit [LV]",
-                1,
-                9);
-        GT_MetaTileEntity_Hatch_Energy_RTG aHatch2 = new GT_MetaTileEntity_Hatch_Energy_RTG(
-                aID++,
-                "hatch.energy.rtg.tier.02",
-                "RTG Power Unit [MV]",
-                2,
-                9);
-        GT_MetaTileEntity_Hatch_Energy_RTG aHatch3 = new GT_MetaTileEntity_Hatch_Energy_RTG(
-                aID++,
-                "hatch.energy.rtg.tier.03",
-                "RTG Power Unit [HV]",
-                3,
-                9);
-
-        GregtechItemList.Hatch_RTG_LV.set(aHatch1.getStackForm(1L));
-        GregtechItemList.Hatch_RTG_MV.set(aHatch2.getStackForm(1L));
-        GregtechItemList.Hatch_RTG_HV.set(aHatch3.getStackForm(1L));
-    }
-
     private static GT_MetaTileEntity_ChiselBus makeChiselBus(int id, String unlocalizedName, String localizedName,
             int tier) {
         return new GT_MetaTileEntity_ChiselBus(id, unlocalizedName, localizedName, tier);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
index 1495e6e282..08a0b6fcf5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java
@@ -11,7 +11,6 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOreDictNames;
 import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_RfConvertor;
-import gtPlusPlus.xmod.gregtech.common.tileentities.generators.creative.GregtechMetaCreativeEnergyBuffer;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaEnergyBuffer;
 
 public class GregtechEnergyBuffer {
@@ -66,15 +65,6 @@ public class GregtechEnergyBuffer {
         GregtechItemList.Energy_Buffer_1by1_MAX.set(
                 new GregtechMetaEnergyBuffer(779, "energybuffer.tier.09", "MAX Voltage Energy Buffer", 9, "", 1)
                         .getStackForm(1L));
-        // Creative Buffer Has Special ID
-        GregtechItemList.Energy_Buffer_CREATIVE.set(
-                new GregtechMetaCreativeEnergyBuffer(
-                        750,
-                        "energybuffer.tier.xx",
-                        "512V Creative Energy Buffer",
-                        3,
-                        "",
-                        0).getStackForm(1L));
 
         if (COFHCore.isModLoaded() && CORE.ConfigSwitches.enableMachine_RF_Convetor) {
             // RF Convertor Buffer Has Special ID
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
deleted file mode 100644
index b341f867b9..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package gtPlusPlus.xmod.gregtech.registration.gregtech;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OreDictNames;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBlock;
-
-public class GregtechSafeBlock {
-
-    public static void run() {
-        Logger.INFO("Gregtech5u Content | Registering Lockable Safe Blocks.");
-        if (CORE.ConfigSwitches.enableMachine_Safes) {
-            run1();
-        }
-    }
-
-    private static void run1() {
-
-        GregtechItemList.GT_Safe_ULV.set(
-                new GregtechMetaSafeBlock(780, "protection.playersafe.tier.00", "Ultra Low Voltage Player Safe", 0)
-                        .getStackForm(1L));
-        GregtechItemList.GT_Safe_LV.set(
-                new GregtechMetaSafeBlock(781, "protection.playersafe.tier.01", "Low Voltage Player Safe", 1)
-                        .getStackForm(1L));
-        GregtechItemList.GT_Safe_MV.set(
-                new GregtechMetaSafeBlock(782, "protection.playersafe.tier.02", "Medium Voltage Player Safe", 2)
-                        .getStackForm(1L));
-        GregtechItemList.GT_Safe_HV.set(
-                new GregtechMetaSafeBlock(783, "protection.playersafe.tier.03", "High Voltage Player Safe", 3)
-                        .getStackForm(1L));
-        GregtechItemList.GT_Safe_EV.set(
-                new GregtechMetaSafeBlock(784, "protection.playersafe.tier.04", "Extreme Voltage Player Safe", 4)
-                        .getStackForm(1L));
-        GregtechItemList.GT_Safe_IV.set(
-                new GregtechMetaSafeBlock(785, "protection.playersafe.tier.05", "Insane Voltage Player Safe", 5)
-                        .getStackForm(1L));
-        GregtechItemList.GT_Safe_LuV.set(
-                new GregtechMetaSafeBlock(786, "protection.playersafe.tier.06", "Ludicrous Voltage Player Safe", 6)
-                        .getStackForm(1L));
-        GregtechItemList.GT_Safe_ZPM.set(
-                new GregtechMetaSafeBlock(787, "protection.playersafe.tier.07", "ZPM Voltage Player Safe", 7)
-                        .getStackForm(1L));
-        GregtechItemList.GT_Safe_UV.set(
-                new GregtechMetaSafeBlock(788, "protection.playersafe.tier.08", "Ultimate Voltage Player Safe", 8)
-                        .getStackForm(1L));
-        GregtechItemList.GT_Safe_MAX.set(
-                new GregtechMetaSafeBlock(789, "protection.playersafe.tier.09", "MAX Voltage Player Safe", 9)
-                        .getStackForm(1L));
-
-        // To-Do Change Recipes
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Safe_ULV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('V'),
-                        OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'), OreDictNames.craftingChest,
-                        Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Basic) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Safe_LV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('V'),
-                        OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'), OreDictNames.craftingChest,
-                        Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Good) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Safe_MV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('V'),
-                        OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'), OreDictNames.craftingChest,
-                        Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Good) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Safe_HV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('V'),
-                        OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'), OreDictNames.craftingChest,
-                        Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Advanced) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Safe_EV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('V'),
-                        OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest,
-                        Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Elite) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Safe_IV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('V'),
-                        OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest,
-                        Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Safe_LuV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('V'),
-                        OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest,
-                        Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Safe_ZPM.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('V'),
-                        OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest,
-                        Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Safe_UV.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('V'),
-                        OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest,
-                        Character.valueOf('X'), OrePrefixes.circuit.get(Materials.SuperconductorUHV) });
-        GT_ModHandler.addCraftingRecipe(
-                GregtechItemList.GT_Safe_MAX.get(1L, new Object[0]),
-                GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
-                        | GT_ModHandler.RecipeBits.REVERSIBLE
-                        | GT_ModHandler.RecipeBits.BUFFERED,
-                new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('V'),
-                        OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest,
-                        Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Infinite) });
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
index 03c600eda5..ccd7d6cbf7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java
@@ -2,7 +2,6 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_ConnectableCrate;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest;
 
 public class GregtechSuperChests {
@@ -35,12 +34,5 @@ public class GregtechSuperChests {
         ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_EV.get(1L));
         ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_IV.get(1L));
 
-        // Test Thing
-        GregtechItemList.CrateStorage.set(
-                (new GT_MetaTileEntity_ConnectableCrate(
-                        GT_MetaTileEntity_ConnectableCrate.mCrateID,
-                        "crate.tier.01",
-                        "Interconnecting Storage Crate",
-                        0)).getStackForm(1L));
     }
 }