diff --git a/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping b/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping
index 9108487b21..a48dd460eb 100644
--- a/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping
+++ b/mappings/net/minecraft/entity/boss/impl/EntityWither.mapping
@@ -1,5 +1,7 @@
 CLASS none/yj net/minecraft/entity/boss/impl/EntityWither
-	CLASS none/yj$a		METHOD a canStart ()Z	FIELD a TRACKED_ENTITY_ID_1 Lnone/kj;
+	CLASS none/yj$a
+	METHOD a canStart ()Z
+	FIELD a TRACKED_ENTITY_ID_1 Lnone/kj;
 	FIELD b TRACKED_ENTITY_ID_2 Lnone/kj;
 	FIELD bx TRACKED_ENTITY_IDS [Lnone/kj;
 	FIELD by INVUL_TIMER Lnone/kj;
@@ -9,7 +11,8 @@ CLASS none/yj net/minecraft/entity/boss/impl/EntityWither
 		ARG 0 headIndex
 		ARG 1 value
 	METHOD a canDestroy (Lnone/akw;)Z
-		ARG 0 block	METHOD a deserializeEntityTag (Lnone/dt;)V
+		ARG 0 block
+	METHOD a deserializeEntityTag (Lnone/dt;)V
 	METHOD a registerTagUpgraders (Lnone/pf;)V
 	METHOD a damage (Lnone/rp;F)Z
 		ARG 0 source
diff --git a/mappings/net/minecraft/entity/mob/EntitySkeletonBase_BASE_10312.mapping b/mappings/net/minecraft/entity/mob/EntitySkeletonBase_BASE_10312.mapping
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/mappings/net/minecraft/entity/mob/EntitySkeletonBase_BASE_740.mapping b/mappings/net/minecraft/entity/mob/EntitySkeletonBase_BASE_740.mapping
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/mappings/net/minecraft/entity/mob/EntitySkeletonBase_REMOTE_10312.mapping b/mappings/net/minecraft/entity/mob/EntitySkeletonBase_REMOTE_10312.mapping
deleted file mode 100644
index 1afd6e9a90..0000000000
--- a/mappings/net/minecraft/entity/mob/EntitySkeletonBase_REMOTE_10312.mapping
+++ /dev/null
@@ -1,10 +0,0 @@
-CLASS none/zb net/minecraft/entity/mob/EntitySkeletonBase
-	CLASS none/zb$1
-		METHOD c start ()V
-		METHOD d onRemove ()V
-	METHOD a deserializeEntityTag (Lnone/dt;)V
-	METHOD a setEquippedStack (Lnone/sj;Lnone/aeq;)V
-		ARG 0 slot
-		ARG 1 stack
-	METHOD a attackDistant (Lnone/sn;F)V
-		ARG 0 target
diff --git a/mappings/net/minecraft/entity/mob/EntitySkeletonBase_REMOTE_740.mapping b/mappings/net/minecraft/entity/mob/EntitySkeletonBase_REMOTE_740.mapping
deleted file mode 100644
index 1afd6e9a90..0000000000
--- a/mappings/net/minecraft/entity/mob/EntitySkeletonBase_REMOTE_740.mapping
+++ /dev/null
@@ -1,10 +0,0 @@
-CLASS none/zb net/minecraft/entity/mob/EntitySkeletonBase
-	CLASS none/zb$1
-		METHOD c start ()V
-		METHOD d onRemove ()V
-	METHOD a deserializeEntityTag (Lnone/dt;)V
-	METHOD a setEquippedStack (Lnone/sj;Lnone/aeq;)V
-		ARG 0 slot
-		ARG 1 stack
-	METHOD a attackDistant (Lnone/sn;F)V
-		ARG 0 target
diff --git a/mappings/net/minecraft/entity/mob/impl/EntityEnderman.mapping b/mappings/net/minecraft/entity/mob/impl/EntityEnderman.mapping
index ffd0774fb6..bda8570fb6 100644
--- a/mappings/net/minecraft/entity/mob/impl/EntityEnderman.mapping
+++ b/mappings/net/minecraft/entity/mob/impl/EntityEnderman.mapping
@@ -22,7 +22,8 @@ CLASS none/zg net/minecraft/entity/mob/impl/EntityEnderman
 	FIELD c CARRIABLE_BLOCKS Ljava/util/Set;
 	METHOD G getSoundAmbient ()Lnone/nk;
 	METHOD a setCarriedBlock (Lnone/asj;)V
-		ARG 0 value	METHOD a deserializeEntityTag (Lnone/dt;)V
+		ARG 0 value
+	METHOD a deserializeEntityTag (Lnone/dt;)V
 	METHOD a onTrackedDataSet (Lnone/kj;)V
 		ARG 0 data
 	METHOD a registerTagUpgraders (Lnone/pf;)V
diff --git a/mappings/net/minecraft/entity/mob/impl/EntityGhast.mapping b/mappings/net/minecraft/entity/mob/impl/EntityGhast.mapping
index 72314011ea..6afcef0199 100644
--- a/mappings/net/minecraft/entity/mob/impl/EntityGhast.mapping
+++ b/mappings/net/minecraft/entity/mob/impl/EntityGhast.mapping
@@ -12,7 +12,7 @@ CLASS none/zj net/minecraft/entity/mob/impl/EntityGhast
 		METHOD b shouldContinue ()Z
 		METHOD c start ()V
 	FIELD a SHOOTING Lnone/kj;
-	METHOD G getSoundDeath ()Lnone/nk;
+	METHOD G getSoundAmbient ()Lnone/nk;
 	METHOD a deserializeEntityTag (Lnone/dt;)V
 	METHOD a registerTagUpgraders (Lnone/pf;)V
 	METHOD a damage (Lnone/rp;F)Z