diff --git a/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala b/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala
index 976cbdd0c..bfe6aae8f 100644
--- a/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala
+++ b/src/main/scala/resonantinduction/archaic/crate/TileCrate.scala
@@ -10,14 +10,12 @@ import net.minecraft.item.{Item, ItemStack}
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.oredict.OreDictionary
-import resonant.api.tile.{IRemovable, IFilterable}
-import IRemovable.ISneakPickup
 import resonant.api.tile.IFilterable
-import resonant.lib.wrapper.ByteBufWrapper
-import ByteBufWrapper._
+import resonant.api.tile.IRemovable.ISneakPickup
 import resonant.lib.network.discriminator.PacketType
 import resonant.lib.network.handle.{TPacketReceiver, TPacketSender}
 import resonant.lib.prefab.tile.TileInventory
+import resonant.lib.wrapper.ByteBufWrapper._
 import resonantinduction.archaic.ArchaicContent
 
 /** Basic single stack inventory.
diff --git a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala
index 706fc4a67..bd3b2b564 100644
--- a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala
+++ b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.scala
@@ -17,11 +17,9 @@ import net.minecraft.util.IIcon
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.fluids._
-import resonant.content.spatial.block.SpatialTile
 import resonant.lib.grid.thermal.{BoilEvent, ThermalPhysics}
 import resonant.lib.content.prefab.{TElectric, TInventory}
-import resonant.lib.wrapper.ByteBufWrapper
-import ByteBufWrapper._
+import resonant.lib.wrapper.ByteBufWrapper._
 import resonant.lib.network.discriminator.PacketType
 import resonant.lib.network.handle.{TPacketReceiver, TPacketSender}
 import resonant.lib.grid.energy.EnergyStorage
diff --git a/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala b/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala
index ec5b15815..814894814 100644
--- a/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala
+++ b/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.scala
@@ -10,8 +10,7 @@ import net.minecraft.item.crafting.FurnaceRecipes
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.util.IIcon
 import net.minecraft.world.IBlockAccess
-import resonant.lib.wrapper.ByteBufWrapper
-import ByteBufWrapper._
+import resonant.lib.wrapper.ByteBufWrapper._
 import resonant.lib.network.discriminator.PacketType
 import resonant.lib.network.handle.{TPacketReceiver, TPacketSender}
 import resonant.lib.prefab.tile.TileInventory
diff --git a/src/main/scala/resonantinduction/atomic/AtomicContent.scala b/src/main/scala/resonantinduction/atomic/AtomicContent.scala
index dbcc45d04..0cfdbf7d4 100644
--- a/src/main/scala/resonantinduction/atomic/AtomicContent.scala
+++ b/src/main/scala/resonantinduction/atomic/AtomicContent.scala
@@ -22,7 +22,6 @@ import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe}
 import resonant.api.tile.IElectromagnet
 import resonant.api.event.PlasmaEvent
 import resonant.api.recipe.QuantumAssemblerRecipes
-import resonant.content.loader.ExplicitContentName
 import resonant.lib.grid.thermal.EventThermal
 import resonant.lib.network.discriminator.PacketAnnotationManager
 import resonant.lib.mod.content.{ContentHolder, ExplicitContentName}
diff --git a/src/main/scala/resonantinduction/core/prefab/node/TileFluidProvider.scala b/src/main/scala/resonantinduction/core/prefab/node/TileFluidProvider.scala
index 965e83d04..ffb926b22 100644
--- a/src/main/scala/resonantinduction/core/prefab/node/TileFluidProvider.scala
+++ b/src/main/scala/resonantinduction/core/prefab/node/TileFluidProvider.scala
@@ -5,8 +5,7 @@ import net.minecraft.block.material.Material
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.fluids._
-import resonant.lib.wrapper.ByteBufWrapper
-import ByteBufWrapper._
+import resonant.lib.wrapper.ByteBufWrapper._
 import resonant.lib.network.discriminator.PacketType
 import resonant.lib.network.handle.{TPacketReceiver, TPacketSender}
 import resonant.lib.grid.node.TSpatialNodeProvider
diff --git a/src/main/scala/resonantinduction/electrical/ElectricalContent.scala b/src/main/scala/resonantinduction/electrical/ElectricalContent.scala
index 67ecebdd1..2c1435ca5 100644
--- a/src/main/scala/resonantinduction/electrical/ElectricalContent.scala
+++ b/src/main/scala/resonantinduction/electrical/ElectricalContent.scala
@@ -12,7 +12,6 @@ import net.minecraft.util.ResourceLocation
 import net.minecraftforge.client.event.TextureStitchEvent
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.oredict.{OreDictionary, ShapelessOreRecipe}
-import resonant.content.loader.ContentHolder
 import resonant.lib.mod.content.{ExplicitContentName, ContentHolder}
 import resonant.lib.utility.recipe.UniversalRecipe
 import resonantinduction.atomic.gate.{ItemQuantumGlyph, PartQuantumGlyph}
diff --git a/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala b/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala
index 9708b7172..8ac24e8b8 100644
--- a/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala
+++ b/src/main/scala/resonantinduction/mechanical/mech/TileMechanical.scala
@@ -10,8 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection
 import resonant.lib.prefab.tile.traits.TRotatable
 import resonant.engine.ResonantEngine
 import resonant.lib.grid.node.TSpatialNodeProvider
-import resonant.lib.wrapper.ByteBufWrapper
-import ByteBufWrapper._
+import resonant.lib.wrapper.ByteBufWrapper._
 import resonant.lib.network.discriminator.PacketType
 import resonant.lib.network.handle.{TPacketReceiver, TPacketSender}
 import resonant.lib.prefab.tile.spatial.SpatialTile
diff --git a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala
index d5d120f2c..eb1486be6 100644
--- a/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala
+++ b/src/main/scala/resonantinduction/mechanical/mech/turbine/TileTurbine.scala
@@ -12,8 +12,7 @@ import net.minecraft.util.AxisAlignedBB
 import net.minecraft.world.World
 import net.minecraftforge.common.util.ForgeDirection
 import resonant.lib.prefab.tile.multiblock.reference.IMultiBlockStructure
-import resonant.lib.wrapper.ByteBufWrapper
-import ByteBufWrapper._
+import resonant.lib.wrapper.ByteBufWrapper._
 import resonant.lib.network.discriminator.PacketType
 import resonant.lib.transform.vector.Vector3
 import resonantinduction.mechanical.mech.TileMechanical