diff --git a/mappings/net/minecraft/block/CakeBlock.mapping b/mappings/net/minecraft/block/CakeBlock.mapping
index cf2d2cf96d..f5abb86e78 100644
--- a/mappings/net/minecraft/block/CakeBlock.mapping
+++ b/mappings/net/minecraft/block/CakeBlock.mapping
@@ -1,5 +1,4 @@
 CLASS bhw net/minecraft/block/CakeBlock
 	FIELD a BITES Lbrk;
-	FIELD b SHAPE Lcnl;
 	METHOD <init> (Lbhn$c;)V
 		ARG 1 settings
diff --git a/mappings/net/minecraft/block/HorizontalFacingBlock.mapping b/mappings/net/minecraft/block/HorizontalFacingBlock.mapping
index a6b324fdf8..4dcfb51d28 100644
--- a/mappings/net/minecraft/block/HorizontalFacingBlock.mapping
+++ b/mappings/net/minecraft/block/HorizontalFacingBlock.mapping
@@ -1,4 +1,3 @@
 CLASS bkd net/minecraft/block/HorizontalFacingBlock
-	FIELD a FACING Lbrf;
 	METHOD <init> (Lbhn$c;)V
 		ARG 1 settings
diff --git a/mappings/net/minecraft/block/PistonBlock.mapping b/mappings/net/minecraft/block/PistonBlock.mapping
index 37fb8612b6..aa06c4342c 100644
--- a/mappings/net/minecraft/block/PistonBlock.mapping
+++ b/mappings/net/minecraft/block/PistonBlock.mapping
@@ -1,5 +1,4 @@
 CLASS bqe net/minecraft/block/PistonBlock
-	FIELD a EXTENDED Lbrc;
 	FIELD i isSticky Z
 	METHOD a move (Lbcl;Let;Ley;Z)Z
 		ARG 1 world
diff --git a/mappings/net/minecraft/block/PistonHeadBlock.mapping b/mappings/net/minecraft/block/PistonHeadBlock.mapping
index 5922d119d9..47048318f3 100644
--- a/mappings/net/minecraft/block/PistonHeadBlock.mapping
+++ b/mappings/net/minecraft/block/PistonHeadBlock.mapping
@@ -1,6 +1,4 @@
 CLASS bqf net/minecraft/block/PistonHeadBlock
-	FIELD a TYPE Lbri;
-	FIELD b SHORT Lbrc;
 	METHOD <init> (Lbhn$c;)V
 		ARG 1 settings
 	METHOD n (Lbqk;)Z
diff --git a/mappings/net/minecraft/block/RepeaterBlock.mapping b/mappings/net/minecraft/block/RepeaterBlock.mapping
index 90e8fb1cbd..7866ea0db0 100644
--- a/mappings/net/minecraft/block/RepeaterBlock.mapping
+++ b/mappings/net/minecraft/block/RepeaterBlock.mapping
@@ -1,5 +1,4 @@
 CLASS blw net/minecraft/block/RepeaterBlock
 	FIELD a LOCKED Lbrc;
-	FIELD b DELAY Lbrk;
 	METHOD <init> (Lbhn$c;)V
 		ARG 1 settings
diff --git a/mappings/net/minecraft/block/TurtleEggBlock.mapping b/mappings/net/minecraft/block/TurtleEggBlock.mapping
index 32bf5b1b0d..c64f49fc14 100644
--- a/mappings/net/minecraft/block/TurtleEggBlock.mapping
+++ b/mappings/net/minecraft/block/TurtleEggBlock.mapping
@@ -1,7 +1,3 @@
 CLASS bnp net/minecraft/block/TurtleEggBlock
-	FIELD a SMALL_SHAPE Lcnl;
-	FIELD b BIG_SHAPE Lcnl;
-	FIELD c HATCH Lbrk;
-	FIELD d EGGS Lbrk;
 	METHOD <init> (Lbhn$c;)V
 		ARG 1 settings
diff --git a/mappings/net/minecraft/nbt/AbstractListTag.mapping b/mappings/net/minecraft/nbt/AbstractListTag.mapping
index d66041398d..c7a39544fd 100644
--- a/mappings/net/minecraft/nbt/AbstractListTag.mapping
+++ b/mappings/net/minecraft/nbt/AbstractListTag.mapping
@@ -3,9 +3,9 @@ CLASS hq net/minecraft/nbt/AbstractListTag
 		ARG 1 index
 	METHOD b addTag (ILii;)Z
 		ARG 1 index
-	METHOD c getTag (I)Lii;
-	METHOD c set (ILii;)V
+	METHOD c remove (I)Lii;
+	METHOD c add (ILii;)V
 		ARG 1 index
-	METHOD d getOrDefault (ILii;)Lii;
+	METHOD d set (ILii;)Lii;
 	METHOD set (ILjava/lang/Object;)Ljava/lang/Object;
 		ARG 1 index
diff --git a/mappings/net/minecraft/structure/generator/StrongholdGenerator.mapping b/mappings/net/minecraft/structure/generator/StrongholdGenerator.mapping
index 3ee5349f39..8f0c7a9d28 100644
--- a/mappings/net/minecraft/structure/generator/StrongholdGenerator.mapping
+++ b/mappings/net/minecraft/structure/generator/StrongholdGenerator.mapping
@@ -1,11 +1,10 @@
 CLASS cde net/minecraft/structure/generator/StrongholdGenerator
-	CLASS cde$m Start
+	CLASS cde$a Door
 	CLASS cde$c FiveWayCrossing
 		FIELD a leftLow Z
 		FIELD b leftHigh Z
 		FIELD c rightLow Z
 		FIELD e rightHigh Z
+	CLASS cde$m Start
 	CLASS cde$p
-		CLASS cde$p$a
 		FIELD d entryDoor Lcde$p$a;
-	CLASS cde$p$a Door
diff --git a/mappings/net/minecraft/util/Pair.mapping b/mappings/net/minecraft/util/Pair.mapping
index be510823bc..374c6c3fe5 100644
--- a/mappings/net/minecraft/util/Pair.mapping
+++ b/mappings/net/minecraft/util/Pair.mapping
@@ -1,6 +1,4 @@
 CLASS zh net/minecraft/util/Pair
-	FIELD a left Lzh$A;
-	FIELD b right Lzh$B;
 	METHOD <init> (Ljava/lang/Object;Ljava/lang/Object;)V
 		ARG 1 left
 		ARG 2 right