diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java
index 5d7e5ab8f0d..7571a4287a4 100644
--- a/src/main/java/net/minecraftforge/common/ForgeHooks.java
+++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java
@@ -15,7 +15,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@@ -112,16 +111,12 @@
 import net.minecraft.world.level.biome.BiomeSpecialEffects;
 import net.minecraft.world.level.biome.BiomeGenerationSettings;
 import net.minecraft.world.level.biome.MobSpawnSettings;
-import net.minecraftforge.common.capabilities.ICapabilityProvider;
-import net.minecraftforge.common.extensions.IForgeItemStack;
-import net.minecraftforge.common.extensions.IForgePlayer;
 import net.minecraftforge.common.util.BlockSnapshot;
 import net.minecraftforge.common.util.BrainBuilder;
 import net.minecraftforge.common.util.Lazy;
 import net.minecraftforge.common.util.MavenVersionStringHelper;
 import net.minecraftforge.common.util.MutableHashedLinkedMap;
 import net.minecraftforge.event.AnvilUpdateEvent;
-import net.minecraftforge.event.AttachCapabilitiesEvent;
 import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
 import net.minecraftforge.event.DifficultyChangeEvent;
 import net.minecraftforge.event.ForgeEventFactory;
@@ -164,7 +159,6 @@
 import net.minecraftforge.event.network.CustomPayloadEvent;
 import net.minecraftforge.eventbus.api.Event;
 import net.minecraftforge.fluids.FluidType;
-import net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoader;
 import net.minecraftforge.fml.config.ConfigTracker;
diff --git a/src/main/java/net/minecraftforge/common/capabilities/CapabilityDispatcher.java b/src/main/java/net/minecraftforge/common/capabilities/CapabilityDispatcher.java
index 93784e010e5..5587ed365e8 100644
--- a/src/main/java/net/minecraftforge/common/capabilities/CapabilityDispatcher.java
+++ b/src/main/java/net/minecraftforge/common/capabilities/CapabilityDispatcher.java
@@ -18,7 +18,6 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.common.util.INBTSerializable;
 import net.minecraftforge.common.util.LazyOptional;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/net/minecraftforge/common/capabilities/CapabilitySystem.java b/src/main/java/net/minecraftforge/common/capabilities/CapabilitySystem.java
index d733681364d..e1b28873956 100644
--- a/src/main/java/net/minecraftforge/common/capabilities/CapabilitySystem.java
+++ b/src/main/java/net/minecraftforge/common/capabilities/CapabilitySystem.java
@@ -6,16 +6,7 @@
 package net.minecraftforge.common.capabilities;
 
 import net.minecraft.world.item.Item;
-import net.minecraft.world.item.MilkBucketItem;
-import net.minecraftforge.client.gui.overlay.ForgeGui;
-import net.minecraftforge.common.ForgeHooks;
-import net.minecraftforge.common.extensions.IForgeBlockEntity;
-import net.minecraftforge.common.extensions.IForgeEntity;
-import net.minecraftforge.common.extensions.IForgeItemStack;
-import net.minecraftforge.common.extensions.IForgeLevel;
-import net.minecraftforge.common.extensions.IForgeLevelChunk;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
-import net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java b/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java
index 5f8cb784ac7..1155b9f0b1c 100644
--- a/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java
+++ b/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java
@@ -33,8 +33,8 @@
 import net.minecraftforge.common.SoundAction;
 import net.minecraftforge.common.capabilities.ICapabilitySerializable;
 import net.minecraftforge.entity.PartEntity;
-import net.minecraftforge.fluids.FluidType;
 import net.minecraftforge.event.entity.EntityEvent;
+import net.minecraftforge.fluids.FluidType;
 import org.jetbrains.annotations.Nullable;
 
 public interface IForgeEntity extends ICapabilitySerializable<CompoundTag>
@@ -448,4 +448,4 @@ default boolean shouldUpdateFluidWhileBoating(FluidState state, Boat boat)
     {
         return boat.shouldUpdateFluidWhileRiding(state, self());
     }
-}
+}
\ No newline at end of file