diff --git a/versions/1.21.9/src/main/java/org/saturnclient/impl/features/mixins/misc/NametagsMixin.java b/versions/1.21.9/src/main/java/org/saturnclient/impl/features/mixins/misc/NametagsMixin.java
deleted file mode 100644
index 0823c81..0000000
--- a/versions/1.21.9/src/main/java/org/saturnclient/impl/features/mixins/misc/NametagsMixin.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.saturnclient.impl.features.mixins.misc;
-
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.EntityRenderer;
-import net.minecraft.client.render.entity.state.EntityRenderState;
-import net.minecraft.client.render.entity.state.LivingEntityRenderState;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.Text;
-
-import org.saturnclient.impl.features.entity.EntityFeatureImpl;
-import org.saturnclient.impl.features.entity.HealthRenderState;
-import org.saturnclient.impl.features.mixins.render.LivingEntityRenderStateMixin;
-import org.saturnclient.mod.mods.NametagsMod;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-/**
- * Intercepts nametag rendering and replaces the displayed text with
- * the string produced by {@link NametagsMod#getNametagString}.
- *
- * Key changes from the original:
- *
- * <ul>
- * <li>The old {@code NametagsFabric.EntityStateImpl} bridge class is
- * replaced by {@link EntityFeatureImpl.RenderStateEntityState},
- * which wraps the {@link HealthRenderState} already injected into
- * the render state by {@link LivingEntityRenderStateMixin}.</li>
- * <li>The feature import changes from {@code Nametags} to
- * {@link NametagsMod}; the two static methods
- * ({@code shouldReplaceName} / {@code getNametagString}) are
- * unchanged in signature.</li>
- * <li>The entity's display name is extracted from the render state's
- * {@code nameVisible} / text fields where available, falling back
- * to the plain text string passed to this method.</li>
- * </ul>
- *
- * The re-entrancy guard ({@code saturn$rendering}) is kept intact to
- * prevent infinite recursion when we call {@code renderLabelIfPresent}
- * with the replacement text.
- */
-@Mixin(EntityRenderer.class)
-public abstract class NametagsMixin {
-
-    /** Guards against the recursive call we make with the replacement text. */
-    // @Unique
-    // private static final ThreadLocal<Boolean> saturn$rendering = ThreadLocal.withInitial(() -> false);
-
-    // @Shadow
-    // protected abstract <S extends EntityRenderState> void renderLabelIfPresent(
-    //         S state, Text text,
-    //         MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light);
-
-    // @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true)
-    // private <S extends EntityRenderState> void saturn$replaceNametag(
-    //         S state, Text text,
-    //         MatrixStack matrices, VertexConsumerProvider vertexConsumers,
-    //         int light, CallbackInfo ci) {
-
-    //     // Skip our own recursive call
-    //     if (saturn$rendering.get())
-    //         return;
-
-    //     if (!NametagsMod.shouldReplaceName())
-    //         return;
-
-    //     // Only living entities carry health data
-    //     if (!(state instanceof LivingEntityRenderState living))
-    //         return;
-    //     if (!(living instanceof HealthRenderState hrs))
-    //         return;
-
-    //     // Build the platform-neutral EntityState from the render-state snapshot
-    //     // (health/type were written by LivingEntityRendererMixin at extract time).
-    //     String customName = text != null ? text.getString() : null;
-    //     EntityFeatureImpl.RenderStateEntityState entityState = new EntityFeatureImpl.RenderStateEntityState(
-    //             customName, hrs);
-
-    //     // Ask the feature for the replacement string
-    //     String replacement = NametagsMod.getNametagString(entityState);
-    //     if (replacement == null)
-    //         return; // feature decided not to replace this entity
-
-    //     ci.cancel();
-    //     saturn$rendering.set(true);
-    //     try {
-    //         renderLabelIfPresent(state, Text.literal(replacement), matrices, vertexConsumers, light);
-    //     } finally {
-    //         saturn$rendering.set(false);
-    //     }
-    // }
-}
diff --git a/versions/1.21.9/src/main/java/org/saturnclient/impl/features/mixins/render/LivingEntityRenderStateMixin.java b/versions/1.21.9/src/main/java/org/saturnclient/impl/features/mixins/render/LivingEntityRenderStateMixin.java
index bbb293b..c8cd2c2 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/impl/features/mixins/render/LivingEntityRenderStateMixin.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/impl/features/mixins/render/LivingEntityRenderStateMixin.java
@@ -4,7 +4,6 @@ import net.minecraft.client.render.entity.state.LivingEntityRenderState;
 
 import org.saturnclient.common.feature.EntityFeature;
 import org.saturnclient.impl.features.entity.HealthRenderState;
-import org.saturnclient.impl.features.mixins.misc.NametagsMixin;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
diff --git a/versions/1.21.9/src/main/resources/features.mixins.json b/versions/1.21.9/src/main/resources/features.mixins.json
index 8d3c331..4c74195 100644
--- a/versions/1.21.9/src/main/resources/features.mixins.json
+++ b/versions/1.21.9/src/main/resources/features.mixins.json
@@ -9,7 +9,6 @@
     "render.LivingEntityRendererMixin",
     "render.LivingEntityRenderStateMixin",
     "render.BackgroundRendererMixin",
-    "misc.NametagsMixin",
     "render.RenderMixin",
     "world.TpsMixin",
     "entity.CameraMixin",