diff --git a/src/main/java/li/cil/oc2/common/Main.java b/src/main/java/li/cil/oc2/common/Main.java
index 221f0e49..5fdbd354 100644
--- a/src/main/java/li/cil/oc2/common/Main.java
+++ b/src/main/java/li/cil/oc2/common/Main.java
@@ -10,8 +10,8 @@ import li.cil.oc2.common.bus.device.data.Firmwares;
 import li.cil.oc2.common.bus.device.provider.Providers;
 import li.cil.oc2.common.container.Containers;
 import li.cil.oc2.common.entity.Entities;
-import li.cil.oc2.common.item.crafting.RecipeSerializers;
 import li.cil.oc2.common.item.Items;
+import li.cil.oc2.common.item.crafting.RecipeSerializers;
 import li.cil.oc2.common.serialization.serializers.Serializers;
 import li.cil.oc2.common.tags.BlockTags;
 import li.cil.oc2.common.tags.ItemTags;
diff --git a/src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java b/src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java
index e26e8e95..574f2c6f 100644
--- a/src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java
+++ b/src/main/java/li/cil/oc2/common/block/DiskDriveBlock.java
@@ -1,6 +1,5 @@
 package li.cil.oc2.common.block;
 
-import li.cil.oc2.common.tags.ItemTags;
 import li.cil.oc2.common.tileentity.DiskDriveTileEntity;
 import li.cil.oc2.common.tileentity.TileEntities;
 import net.minecraft.block.Block;
diff --git a/src/main/java/li/cil/oc2/common/entity/RobotEntity.java b/src/main/java/li/cil/oc2/common/entity/RobotEntity.java
index 3c7d5198..dd379fd7 100644
--- a/src/main/java/li/cil/oc2/common/entity/RobotEntity.java
+++ b/src/main/java/li/cil/oc2/common/entity/RobotEntity.java
@@ -50,7 +50,10 @@ import net.minecraft.network.datasync.DataParameter;
 import net.minecraft.network.datasync.DataSerializers;
 import net.minecraft.network.datasync.EntityDataManager;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.*;
+import net.minecraft.util.ActionResultType;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
+import net.minecraft.util.IIntArray;
 import net.minecraft.util.math.*;
 import net.minecraft.util.math.shapes.IBooleanFunction;
 import net.minecraft.util.math.shapes.VoxelShape;
diff --git a/src/main/java/li/cil/oc2/common/tileentity/BusCableTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/BusCableTileEntity.java
index 07a03275..be91b6c3 100644
--- a/src/main/java/li/cil/oc2/common/tileentity/BusCableTileEntity.java
+++ b/src/main/java/li/cil/oc2/common/tileentity/BusCableTileEntity.java
@@ -1,6 +1,5 @@
 package li.cil.oc2.common.tileentity;
 
-import li.cil.oc2.client.model.BusCableBakedModel;
 import li.cil.oc2.common.Config;
 import li.cil.oc2.common.Constants;
 import li.cil.oc2.common.block.BusCableBlock;
@@ -19,7 +18,6 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.StringUtils;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraftforge.client.model.data.IModelData;
 
 import javax.annotation.Nullable;
 import java.util.HashSet;