diff --git a/src/main/java/com/zandor300/advancedtools/creativetab/CreativeTabATMaterials.java b/src/main/java/com/zandor300/advancedtools/creativetab/CreativeTabATMaterials.java
index 1fd5e773bb07ed974184b6f6d67aa2e8c1b004aa..bdfd667b86c1bab4832a2fff6d894f4f722a6424 100644
--- a/src/main/java/com/zandor300/advancedtools/creativetab/CreativeTabATMaterials.java
+++ b/src/main/java/com/zandor300/advancedtools/creativetab/CreativeTabATMaterials.java
@@ -17,4 +17,4 @@ public class CreativeTabATMaterials {
             return "Advanced Tools:Materials";
         }
     };
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/zandor300/advancedtools/init/always/ModItems.java b/src/main/java/com/zandor300/advancedtools/init/always/ModItems.java
index 81c10d7a07ecee3885bf3c6c2971f8b9a79d0bf0..773efe971dfde5ebcbfc93dbba15dcfc58034341 100644
--- a/src/main/java/com/zandor300/advancedtools/init/always/ModItems.java
+++ b/src/main/java/com/zandor300/advancedtools/init/always/ModItems.java
@@ -77,6 +77,7 @@ public class ModItems {
     public static Item emeraldBoots = new EmeraldArmor("EmeraldBoots", "emeraldboots", emeraldArmor, 3);
 
     // Enderion
+    // TODO: To be replaced to Advanced Machines
     // TODO: Change Tool and Armor material values to fit Enderion.
     // TODO: Finish Enderion.
     public static Item.ToolMaterial enderion = EnumHelper.addToolMaterial("Enderion", 3, 2000, 11.0f, 4.5f, 32);
@@ -128,6 +129,7 @@ public class ModItems {
     //public static Item flintBoots = new FlintArmor("flintBoots", "flintboots", flintArmor, 3);
 
     // Netherion
+    // TODO: To be replaced to Advanced Machines
     // TODO: Change Tool and Armor material values to fit Netherion.
     // TODO: Finish Netherion.
     //public static Item.ToolMaterial netherion = EnumHelper.addToolMaterial("Netherion", 2, 400, 6.5f, 3.0f, 15);
@@ -145,6 +147,7 @@ public class ModItems {
     //public static Item netherionBoots = new NetherionArmor("netherionBoots", "netherionboots", netherionArmor, 3);
 
     // Quartz
+    // TODO: To be replaced to Advanced Machines
     // TODO: Change Tool and Armor material values to fit Quartz.
     // TODO: Finish Quartz.
     //public static Item.ToolMaterial quartz = EnumHelper.addToolMaterial("Quartz", 2, 400, 6.5f, 3.0f, 15);
@@ -162,6 +165,7 @@ public class ModItems {
     //public static Item quartzBoots = new QuartzArmor("quartzBoots", "quartzboots", quartzArmor, 3);
 
     // Copper
+    // TODO: To be replaced to Advanced Machines
     // TODO: Change Tool and Armor material values to fit Copper.
     // TODO: Finish Copper.
     //public static Item.ToolMaterial copper = EnumHelper.addToolMaterial("Copper", 2, 400, 6.5f, 3.0f, 15);
@@ -230,6 +234,7 @@ public class ModItems {
         GameRegistry.registerItem(boneHoe, "Bone Hoe");
 
         // Enderion
+        // TODO: To be replaced to Advanced Machines
         GameRegistry.registerItem(enderionPickaxe, "Enderion Pickaxe");
         GameRegistry.registerItem(enderionShovel, "Enderion Shovel");
         GameRegistry.registerItem(enderionAxe, "Enderion Axe");
@@ -253,6 +258,7 @@ public class ModItems {
         //GameRegistry.registerItem(flintHoe, "Flint Hoe");
 
         // Netherion
+        // TODO: To be replaced to Advanced Machines
         // TODO: Make Textures for Netherion before being re-enabled.
         //GameRegistry.registerItem(netherionPickaxe, "Netherion Pickaxe");
         //GameRegistry.registerItem(netherionShovel, "Netherion Shovel");
@@ -261,6 +267,7 @@ public class ModItems {
         //GameRegistry.registerItem(netherionHoe, "Netherion Hoe");
 
         // Quartz
+        // TODO: To be replaced to Advanced Machines
         // TODO: Make Textures for Quartz before being re-enabled.
         //GameRegistry.registerItem(quartzPickaxe, "Quartz Pickaxe");
         //GameRegistry.registerItem(quartzShovel, "Quartz Shovel");
@@ -269,6 +276,7 @@ public class ModItems {
         //GameRegistry.registerItem(quartzHoe, "Quartz Hoe");
 
         // Copper
+        // TODO: To be replaced to Advanced Machines
         // TODO: Make Textures for Copper before being re-enabled.
         //GameRegistry.registerItem(copperPickaxe, "Copper Pickaxe");
         //GameRegistry.registerItem(copperShovel, "Copper Shovel");
@@ -316,6 +324,7 @@ public class ModItems {
         //GameRegistry.registerItem(flintBoots, "Flint Boots");
 
         // Netherion
+        // TODO: To be replaced to Advanced Machines
         // TODO: Make Textures for Netherion before being re-enabled.
         //GameRegistry.registerItem(netherionHelmet, "Netherion Helmet");
         //GameRegistry.registerItem(netherionChestplate, "Netherion Chestplate");
@@ -323,6 +332,7 @@ public class ModItems {
         //GameRegistry.registerItem(netherionBoots, "Netherion Boots");
 
         // Quartz
+        // TODO: To be replaced to Advanced Machines
         // TODO: Make Textures for Quartz before being re-enabled.
         //GameRegistry.registerItem(quartzHelmet, "Quartz Helmet");
         //GameRegistry.registerItem(quartzChestplate, "Quartz Chestplate");
@@ -330,6 +340,7 @@ public class ModItems {
         //GameRegistry.registerItem(quartzBoots, "Quartz Boots");
 
         // Copper
+        // TODO: To be replaced to Advanced Machines
         // TODO: Make Textures for Copper before being re-enabled.
         //GameRegistry.registerItem(copperHelmet, "Copper Helmet");
         //GameRegistry.registerItem(copperChestplate, "Copper Chestplate");
diff --git a/src/main/java/com/zandor300/advancedtools/items/armor/EnderionArmor.java b/src/main/java/com/zandor300/advancedtools/items/armor/EnderionArmor.java
index 5369ada56795b4dc32d9bd2376c017b9cc9c67b2..df095fb62836d952abe3051fba144469a73cc69d 100644
--- a/src/main/java/com/zandor300/advancedtools/items/armor/EnderionArmor.java
+++ b/src/main/java/com/zandor300/advancedtools/items/armor/EnderionArmor.java
@@ -4,6 +4,7 @@ import com.zandor300.advancedtools.creativetab.CreativeTabATTools;
 import com.zandor300.advancedtools.items.genericitems.ATItemArmor;
 import com.zandor300.advancedtools.reference.Reference;
 
+@Deprecated
 public class EnderionArmor extends ATItemArmor{
     public EnderionArmor(String name, String texture, ArmorMaterial material, int j) {
         super(material, j, j);
diff --git a/src/main/java/com/zandor300/advancedtools/items/armor/NetherionArmor.java b/src/main/java/com/zandor300/advancedtools/items/armor/NetherionArmor.java
index 0642ead1acdbac0b023b4d90b39a2ed03658407e..e1182f0df5b2d61f3edf0f6c61fa0bcefb8eaf99 100644
--- a/src/main/java/com/zandor300/advancedtools/items/armor/NetherionArmor.java
+++ b/src/main/java/com/zandor300/advancedtools/items/armor/NetherionArmor.java
@@ -4,6 +4,7 @@ import com.zandor300.advancedtools.creativetab.CreativeTabATTools;
 import com.zandor300.advancedtools.items.genericitems.ATItemArmor;
 import com.zandor300.advancedtools.reference.Reference;
 
+@Deprecated
 public class NetherionArmor extends ATItemArmor {
     public NetherionArmor(String name, String texture, ArmorMaterial material, int j) {
         super(material, j, j);
diff --git a/src/main/java/com/zandor300/advancedtools/items/armor/QuartzArmor.java b/src/main/java/com/zandor300/advancedtools/items/armor/QuartzArmor.java
index 3584e2b888528098332ec4111a91cf0dfbedc435..4dcd4b6d149620471a8c7f427b433338f36b8b17 100644
--- a/src/main/java/com/zandor300/advancedtools/items/armor/QuartzArmor.java
+++ b/src/main/java/com/zandor300/advancedtools/items/armor/QuartzArmor.java
@@ -4,6 +4,7 @@ import com.zandor300.advancedtools.creativetab.CreativeTabATTools;
 import com.zandor300.advancedtools.items.genericitems.ATItemArmor;
 import com.zandor300.advancedtools.reference.Reference;
 
+@Deprecated
 public class QuartzArmor extends ATItemArmor {
     public QuartzArmor(String name, String texture, ArmorMaterial material, int j) {
         super(material, j, j);
diff --git a/src/main/java/com/zandor300/advancedtools/items/tools/ingot/EnderionIngot.java b/src/main/java/com/zandor300/advancedtools/items/tools/ingot/EnderionIngot.java
index cf9a353d9cc3843556faae748dc3de87c9c67f24..07bd0d7b810ea5eecf2f905ffa1c8536dd6e9a7c 100644
--- a/src/main/java/com/zandor300/advancedtools/items/tools/ingot/EnderionIngot.java
+++ b/src/main/java/com/zandor300/advancedtools/items/tools/ingot/EnderionIngot.java
@@ -2,6 +2,7 @@ package com.zandor300.advancedtools.items.tools.ingot;
 
 import com.zandor300.advancedtools.items.genericitems.ItemAT;
 
+@Deprecated
 public class EnderionIngot extends ItemAT{
     public EnderionIngot(int id) {
         this.setUnlocalizedName("EnderionIngot");