diff --git a/src/api/java/appeng/api/parts/IPartHelper.java b/src/api/java/appeng/api/parts/IPartHelper.java
index 0798fb614..cbe363fbb 100644
--- a/src/api/java/appeng/api/parts/IPartHelper.java
+++ b/src/api/java/appeng/api/parts/IPartHelper.java
@@ -33,10 +33,8 @@ import net.minecraft.world.World;
 
 public interface IPartHelper
 {
-
 	/**
-	 * Register a new layer with the part layer system, this allows you to write
-	 * an in between between tile entities and parts.
+	 * Register a new layer with the part layer system, this allows you to write an in between between tile entities and parts.
 	 *
 	 * AE By Default includes,
 	 *
@@ -54,11 +52,9 @@ public interface IPartHelper
 	 *
 	 * 7. IPipeConnection BC Pipe Connections
 	 *
-	 * As long as a valid layer is registered for a interface you can simply
-	 * implement that interface on a part get implement it.
+	 * As long as a valid layer is registered for a interface you can simply implement that interface on a part get implement it.
 	 *
-	 * @return true on success, false on failure, usually a error will be logged
-	 * as well.
+	 * @return true on success, false on failure, usually a error will be logged as well.
 	 */
 	boolean registerNewLayer( String string, String layerInterface );
 
@@ -70,11 +66,11 @@ public interface IPartHelper
 	/**
 	 * use in use item, to try and place a IBusItem
 	 *
-	 * @param is     ItemStack of an item which implements {@link IPartItem}
-	 * @param BlockPos	pos of part
-	 * @param side   side which the part should be on
+	 * @param is ItemStack of an item which implements {@link IPartItem}
+	 * @param pos pos of part
+	 * @param side side which the part should be on
 	 * @param player player placing part
-	 * @param world  part in world
+	 * @param world part in world
 	 *
 	 * @return true if placing was successful
 	 */
diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java
index 24bab09ec..be8796533 100644
--- a/src/main/java/appeng/core/Registration.java
+++ b/src/main/java/appeng/core/Registration.java
@@ -68,8 +68,6 @@ import appeng.core.localization.GuiText;
 import appeng.core.localization.PlayerMessages;
 import appeng.core.stats.PlayerStatsRegistration;
 import appeng.hooks.TickHandler;
-import appeng.integration.IntegrationRegistry;
-import appeng.integration.IntegrationType;
 import appeng.items.materials.ItemMultiMaterial;
 import appeng.me.cache.CraftingGridCache;
 import appeng.me.cache.EnergyGridCache;
@@ -229,25 +227,26 @@ public final class Registration
 		final Runnable recipeLoader = new RecipeLoader( this.recipeHandler );
 		recipeLoader.run();
 
-		partHelper.registerNewLayer( "appeng.parts.layers.LayerISidedInventory", "net.minecraft.inventory.ISidedInventory" );
-		partHelper.registerNewLayer( "appeng.parts.layers.LayerIFluidHandler", "net.minecraftforge.fluids.IFluidHandler" );
-		partHelper.registerNewLayer( "appeng.parts.layers.LayerITileStorageMonitorable", "appeng.api.implementations.tiles.ITileStorageMonitorable" );
+		// TODO readd layers
+//		partHelper.registerNewLayer( "appeng.parts.layers.LayerISidedInventory", "net.minecraft.inventory.ISidedInventory" );
+//		partHelper.registerNewLayer( "appeng.parts.layers.LayerIFluidHandler", "net.minecraftforge.fluids.IFluidHandler" );
+//		partHelper.registerNewLayer( "appeng.parts.layers.LayerITileStorageMonitorable", "appeng.api.implementations.tiles.ITileStorageMonitorable" );
 
-		if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.IC2 ) )
-		{
-			partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergySink", "ic2.api.energy.tile.IEnergySink" );
-			partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergySource", "ic2.api.energy.tile.IEnergySource" );
-		}
-
-		if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.RF ) )
-		{
-			partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergyHandler", "cofh.api.energy.IEnergyReceiver" );
-		}
-
-		if ( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.OpenComputers ) )
-		{
-			partHelper.registerNewLayer( "appeng.parts.layers.LayerSidedEnvironment", "li.cil.oc.api.network.SidedEnvironment" );
-		}
+//		if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.IC2 ) )
+//		{
+//			partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergySink", "ic2.api.energy.tile.IEnergySink" );
+//			partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergySource", "ic2.api.energy.tile.IEnergySource" );
+//		}
+//
+//		if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.RF ) )
+//		{
+//			partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergyHandler", "cofh.api.energy.IEnergyReceiver" );
+//		}
+//
+//		if ( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.OpenComputers ) )
+//		{
+//			partHelper.registerNewLayer( "appeng.parts.layers.LayerSidedEnvironment", "li.cil.oc.api.network.SidedEnvironment" );
+//		}
 
 		FMLCommonHandler.instance().bus().register( TickHandler.INSTANCE );
 		MinecraftForge.EVENT_BUS.register( TickHandler.INSTANCE );
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/port.recipe b/src/main/resources/assets/appliedenergistics2/recipes/port.recipe
index d9ac3c520..e53b12158 100644
--- a/src/main/resources/assets/appliedenergistics2/recipes/port.recipe
+++ b/src/main/resources/assets/appliedenergistics2/recipes/port.recipe
@@ -140,7 +140,7 @@ shaped=
 
 shaped=
 	mc:iron_ingot cable mc:iron_ingot,
-	ae2:BlockQuartzGlass  ae2:BlockFluix ae2:BlockQuartzGlass,
+	ae2:BlockQuartzGlass  ae2:fluix ae2:BlockQuartzGlass,
 	mc:iron_ingot cable mc:iron_ingot
 	-> ae2:BlockQuartzGrowthAccelerator
 
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/process.recipe b/src/main/resources/assets/appliedenergistics2/recipes/process.recipe
index 05173b108..96d199d8d 100644
--- a/src/main/resources/assets/appliedenergistics2/recipes/process.recipe
+++ b/src/main/resources/assets/appliedenergistics2/recipes/process.recipe
@@ -92,7 +92,7 @@ shaped=
 	shaped=
 		oredictionary:crystalFluix oredictionary:crystalFluix,
 		oredictionary:crystalFluix oredictionary:crystalFluix
-		-> ae2:BlockFluix
+		-> ae2:fluix
 	
 
 # Pure Storage Blocks
@@ -112,7 +112,7 @@ shaped=
 		ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal,
 		ae2:ItemMaterial.PurifiedFluixCrystal _                                      ae2:ItemMaterial.PurifiedFluixCrystal,
 		ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal ae2:ItemMaterial.PurifiedFluixCrystal
-		-> ae2:BlockFluix
+		-> ae2:fluix
 
 
 
@@ -142,7 +142,7 @@ shaped=
 		-> 4 ae2:ItemMaterial.CertusQuartzCrystal
 
 	shapeless=
-		ae2:BlockFluix
+		ae2:fluix
 		-> 4 ae2:ItemMaterial.FluixCrystal
 
 # Quantum Pearl
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/slabs.recipe b/src/main/resources/assets/appliedenergistics2/recipes/slabs.recipe
index eda9bfd99..7fcdf7195 100644
--- a/src/main/resources/assets/appliedenergistics2/recipes/slabs.recipe
+++ b/src/main/resources/assets/appliedenergistics2/recipes/slabs.recipe
@@ -3,7 +3,7 @@ shaped=
     -> 6 ae2:ChiseledQuartzSlabBlock
 
 shaped=
-    ae2:BlockFluix ae2:BlockFluix ae2:BlockFluix
+    ae2:fluix ae2:fluix ae2:fluix
     -> 6 ae2:FluixSlabBlock
 
 shaped=
diff --git a/src/main/resources/assets/appliedenergistics2/recipes/stairs.recipe b/src/main/resources/assets/appliedenergistics2/recipes/stairs.recipe
index b0bc2417c..aa2f7752d 100644
--- a/src/main/resources/assets/appliedenergistics2/recipes/stairs.recipe
+++ b/src/main/resources/assets/appliedenergistics2/recipes/stairs.recipe
@@ -5,9 +5,9 @@ shaped=
     -> 4 ae2:ChiseledQuartzStairBlock
 
 shaped=
-    ae2:BlockFluix _              _,
-    ae2:BlockFluix ae2:BlockFluix _,
-    ae2:BlockFluix ae2:BlockFluix ae2:BlockFluix
+    ae2:fluix _         _,
+    ae2:fluix ae2:fluix _,
+    ae2:fluix ae2:fluix ae2:fluix
     -> 4 ae2:FluixStairBlock
 
 shaped=