diff --git a/build.gradle b/build.gradle
index 1abf58d..7c07941 100755
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ loom {
 			inherit server
 			name "Data Generation"
 			vmArg "-Dfabric-api.datagen"
-			vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
+			vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/java")}"
 			vmArg "-Dfabric-api.datagen.modid=reservermod"
  
 			runDir "build/datagen"
@@ -46,7 +46,7 @@ sourceSets {
 	main {
 		resources {
 			srcDirs += [
-					'src/main/generated'
+					'src/main/java'
 			]
 		}
 	}
diff --git a/src/client/java/modchestClient/networking/modNetworkingClient.java b/src/client/java/modchestClient/networking/modNetworkingClient.java
index 22b879e..172d3c6 100755
--- a/src/client/java/modchestClient/networking/modNetworkingClient.java
+++ b/src/client/java/modchestClient/networking/modNetworkingClient.java
@@ -3,7 +3,6 @@ package modchestClient.networking;
 import modchest.REServerMod;
 import modchestClient.networking.packet.respawnRequestS2CPacket;
 import modchestClient.networking.payload.requestRespawn;
-import modchestClient.networking.payload.startSleepingCallButtons;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.minecraft.util.Identifier;
diff --git a/src/main/java/modchest/block/custom/steeringWheelBlock.java b/src/main/java/modchest/block/custom/steeringWheelBlock.java
index b7d1cc3..01cf18e 100644
--- a/src/main/java/modchest/block/custom/steeringWheelBlock.java
+++ b/src/main/java/modchest/block/custom/steeringWheelBlock.java
@@ -9,12 +9,7 @@ import net.minecraft.block.BlockWithEntity;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.screen.NamedScreenHandlerFactory;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.Hand;
 import net.minecraft.util.ItemScatterer;
-import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/modchest/event/playerAfterRespawnEvent.java b/src/main/java/modchest/event/playerAfterRespawnEvent.java
index 0da4499..fa3fae2 100644
--- a/src/main/java/modchest/event/playerAfterRespawnEvent.java
+++ b/src/main/java/modchest/event/playerAfterRespawnEvent.java
@@ -4,8 +4,6 @@ import modchest.REServerMod;
 import modchest.util.setAndGetMultiButtonsSpawn;
 import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.server.network.ServerPlayerEntity;
diff --git a/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java b/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java
index 635dbb7..278a005 100644
--- a/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java
+++ b/src/main/java/modchest/mixin/ServerPlayerEntityMixin.java
@@ -10,8 +10,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.Arrays;
-
 @Mixin(ServerPlayerEntity.class)
 public abstract class ServerPlayerEntityMixin implements ServerPlayerEntityInterface {
     @Unique
diff --git a/src/main/java/modchest/mixin/bedBlock.java b/src/main/java/modchest/mixin/bedBlock.java
index 865f410..155c105 100644
--- a/src/main/java/modchest/mixin/bedBlock.java
+++ b/src/main/java/modchest/mixin/bedBlock.java
@@ -5,17 +5,14 @@ import modchest.util.setAndGetMultiButtonsSpawn;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import net.minecraft.block.BedBlock;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
diff --git a/src/main/java/modchest/networking/modNetworkingServer.java b/src/main/java/modchest/networking/modNetworkingServer.java
index fbe171a..e12b64f 100644
--- a/src/main/java/modchest/networking/modNetworkingServer.java
+++ b/src/main/java/modchest/networking/modNetworkingServer.java
@@ -4,7 +4,6 @@ import modchest.REServerMod;
 import modchest.networking.packet.deathScreenMultiButtonsC2SPacket;
 import modchest.networking.packet.setNewRespawnsC2SPacket;
 import modchest.networking.payload.deathMultiRespawnButtons;
-import modchest.networking.payload.requestRespawn;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import modchest.networking.payload.startSleepingCallButtons;
diff --git a/src/main/java/modchest/util/ServerPlayerEntityInterface.java b/src/main/java/modchest/util/ServerPlayerEntityInterface.java
index 2f43ab9..094207d 100644
--- a/src/main/java/modchest/util/ServerPlayerEntityInterface.java
+++ b/src/main/java/modchest/util/ServerPlayerEntityInterface.java
@@ -1,8 +1,6 @@
 package modchest.util;
 
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.server.network.ServerPlayerEntity;
-import org.spongepowered.asm.mixin.Unique;
 
 public interface ServerPlayerEntityInterface {
     NbtCompound getDataSaver();
diff --git a/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java b/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java
index 3e0fe7d..1e5ff46 100644
--- a/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java
+++ b/src/main/java/modchest/util/setAndGetMultiButtonsSpawn.java
@@ -2,7 +2,6 @@ package modchest.util;
 
 import modchest.REServerMod;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;