diff --git a/src/main/java/li/cil/oc2/client/gui/util/GuiUtils.java b/src/main/java/li/cil/oc2/client/gui/util/GuiUtils.java
index 0f8c339b..8d10d1ff 100644
--- a/src/main/java/li/cil/oc2/client/gui/util/GuiUtils.java
+++ b/src/main/java/li/cil/oc2/client/gui/util/GuiUtils.java
@@ -12,7 +12,6 @@ import net.minecraft.inventory.container.Slot;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Util;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java b/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java
index 31e463fa..9a80c07a 100644
--- a/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java
+++ b/src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java
@@ -11,11 +11,7 @@ import li.cil.oc2.api.bus.device.rpc.RPCParameter;
 import li.cil.oc2.common.Constants;
 import li.cil.oc2.common.bus.device.rpc.RPCDeviceList;
 import li.cil.oc2.common.bus.device.rpc.RPCMethodParameterTypeAdapters;
-import li.cil.oc2.common.serialization.serializers.UnsignedByteArrayJsonSerializer;
-import li.cil.oc2.common.serialization.serializers.MessageJsonDeserializer;
-import li.cil.oc2.common.serialization.serializers.MethodInvocationJsonDeserializer;
-import li.cil.oc2.common.serialization.serializers.RPCDeviceWithIdentifierJsonSerializer;
-import li.cil.oc2.common.serialization.serializers.RPCMethodJsonSerializer;
+import li.cil.oc2.common.serialization.serializers.*;
 import li.cil.sedna.api.device.Steppable;
 import li.cil.sedna.api.device.serial.SerialDevice;
 
diff --git a/src/main/java/li/cil/oc2/common/tileentity/AbstractTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/AbstractTileEntity.java
index fa394409..bb9f53f5 100644
--- a/src/main/java/li/cil/oc2/common/tileentity/AbstractTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/AbstractTileEntity.java
@@ -4,7 +4,6 @@ import li.cil.oc2.common.util.ServerScheduler;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
-import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 
diff --git a/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java
index ecc227e4..147ce352 100644
--- a/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java
@@ -25,7 +25,6 @@ import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.apache.logging.log4j.LogManager;