diff --git a/src/main/java/com/github/minecraftschurlimods/bibliocraft/client/ClientHandler.java b/src/main/java/com/github/minecraftschurlimods/bibliocraft/client/ClientHandler.java
index 9a41f683..1b5813cb 100644
--- a/src/main/java/com/github/minecraftschurlimods/bibliocraft/client/ClientHandler.java
+++ b/src/main/java/com/github/minecraftschurlimods/bibliocraft/client/ClientHandler.java
@@ -1,7 +1,20 @@
 package com.github.minecraftschurlimods.bibliocraft.client;
 
 import com.github.minecraftschurlimods.bibliocraft.api.BibliocraftApi;
-import com.github.minecraftschurlimods.bibliocraft.client.ber.*;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.ClipboardBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.ClockBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.CookieJarBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.DinnerPlateBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.DiscRackBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.DisplayCaseBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.FancyArmorStandBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.FancyCrafterBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.LabelBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.PotionShelfBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.ShelfBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.SwordPedestalBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.TableBER;
+import com.github.minecraftschurlimods.bibliocraft.client.ber.ToolRackBER;
 import com.github.minecraftschurlimods.bibliocraft.client.model.BookcaseModel;
 import com.github.minecraftschurlimods.bibliocraft.client.model.TableModel;
 import com.github.minecraftschurlimods.bibliocraft.client.screen.BCMenuScreens;
diff --git a/src/main/java/com/github/minecraftschurlimods/bibliocraft/content/clock/FancyClockBlock.java b/src/main/java/com/github/minecraftschurlimods/bibliocraft/content/clock/FancyClockBlock.java
index 990e8907..912ce298 100644
--- a/src/main/java/com/github/minecraftschurlimods/bibliocraft/content/clock/FancyClockBlock.java
+++ b/src/main/java/com/github/minecraftschurlimods/bibliocraft/content/clock/FancyClockBlock.java
@@ -1,20 +1,14 @@
 package com.github.minecraftschurlimods.bibliocraft.content.clock;
 
 import com.github.minecraftschurlimods.bibliocraft.util.ShapeUtil;
-import com.github.minecraftschurlimods.bibliocraft.util.content.BCFacingEntityBlock;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Rotation;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityTicker;
-import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
 
 public class FancyClockBlock extends AbstractClockBlock {
     private static final VoxelShape X_SHAPE = ShapeUtil.combine(
diff --git a/src/main/java/com/github/minecraftschurlimods/bibliocraft/content/clock/GrandfatherClockBlock.java b/src/main/java/com/github/minecraftschurlimods/bibliocraft/content/clock/GrandfatherClockBlock.java
index 3f3baaa7..6e3d8d8f 100644
--- a/src/main/java/com/github/minecraftschurlimods/bibliocraft/content/clock/GrandfatherClockBlock.java
+++ b/src/main/java/com/github/minecraftschurlimods/bibliocraft/content/clock/GrandfatherClockBlock.java
@@ -1,6 +1,5 @@
 package com.github.minecraftschurlimods.bibliocraft.content.clock;
 
-import com.github.minecraftschurlimods.bibliocraft.util.ClientUtil;
 import com.github.minecraftschurlimods.bibliocraft.util.ShapeUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
diff --git a/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/ClientUtil.java b/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/ClientUtil.java
index 22e9011e..eb68aba4 100644
--- a/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/ClientUtil.java
+++ b/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/ClientUtil.java
@@ -1,9 +1,9 @@
 package com.github.minecraftschurlimods.bibliocraft.util;
 
 import com.github.minecraftschurlimods.bibliocraft.client.screen.ClipboardScreen;
-import com.github.minecraftschurlimods.bibliocraft.client.screen.clock.ClockScreen;
 import com.github.minecraftschurlimods.bibliocraft.client.screen.RedstoneBookScreen;
 import com.github.minecraftschurlimods.bibliocraft.client.screen.StockroomCatalogScreen;
+import com.github.minecraftschurlimods.bibliocraft.client.screen.clock.ClockScreen;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/DatagenUtil.java b/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/DatagenUtil.java
index 3af53005..d7567b7c 100644
--- a/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/DatagenUtil.java
+++ b/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/DatagenUtil.java
@@ -4,7 +4,6 @@
 import net.minecraft.Util;
 import net.minecraft.advancements.critereon.StatePropertiesPredicate;
 import net.minecraft.core.Registry;
-import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
 import net.minecraft.data.tags.TagsProvider;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/init/WoodTypeBlockItem.java b/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/init/WoodTypeBlockItem.java
index edb0ac30..c53d843c 100644
--- a/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/init/WoodTypeBlockItem.java
+++ b/src/main/java/com/github/minecraftschurlimods/bibliocraft/util/init/WoodTypeBlockItem.java
@@ -2,7 +2,6 @@
 
 import com.github.minecraftschurlimods.bibliocraft.api.woodtype.BibliocraftWoodType;
 import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.level.block.Block;
 
 public class WoodTypeBlockItem extends BlockItem {