diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping
index 622add9b4a..745a6af53a 100644
--- a/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping
+++ b/mappings/net/minecraft/client/render/entity/model/EntityModelPartNames.mapping
@@ -158,3 +158,5 @@ CLASS net/minecraft/class_6230 net/minecraft/client/render/entity/model/EntityMo
 		COMMENT The key of a wind bottom model part, whose value is {@value}.
 	FIELD field_47450 RODS Ljava/lang/String;
 		COMMENT The key of a rods model part, whose value is {@value}.
+	FIELD field_49564 MUSHROOMS Ljava/lang/String;
+		COMMENT The key of a mushrooms model part, whose value is {@value}.
diff --git a/src/constants/java/net/fabricmc/yarn/constants/LlamaVariants.java b/src/constants/java/net/fabricmc/yarn/constants/LlamaVariants.java
deleted file mode 100644
index c079641659..0000000000
--- a/src/constants/java/net/fabricmc/yarn/constants/LlamaVariants.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * This file is free for everyone to use under the Creative Commons Zero license.
- */
-
-package net.fabricmc.yarn.constants;
-
-public final class LlamaVariants {
-	public static final int CREAMY = 0;
-	public static final int WHITE = 1;
-	public static final int BROWN = 2;
-	public static final int GRAY = 3;
-
-	private LlamaVariants() {
-	}
-}
diff --git a/src/constants/java/net/fabricmc/yarn/constants/ParrotVariants.java b/src/constants/java/net/fabricmc/yarn/constants/ParrotVariants.java
deleted file mode 100644
index 9638e0f3f0..0000000000
--- a/src/constants/java/net/fabricmc/yarn/constants/ParrotVariants.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * This file is free for everyone to use under the Creative Commons Zero license.
- */
-
-package net.fabricmc.yarn.constants;
-
-public final class ParrotVariants {
-	public static final int RED_AND_BLUE = 0;
-	public static final int BLUE = 1;
-	public static final int GREEN = 2;
-	public static final int YELLOW_AND_BLUE = 3;
-	public static final int GRAY = 4;
-
-	private ParrotVariants() {
-	}
-}
diff --git a/unpick-definitions/entity_model_parts.unpick b/unpick-definitions/entity_model_parts.unpick
index 9bf1903492..ad9d38f0ac 100644
--- a/unpick-definitions/entity_model_parts.unpick
+++ b/unpick-definitions/entity_model_parts.unpick
@@ -78,6 +78,7 @@ constant entity_model_parts net/minecraft/client/render/entity/model/EntityModel
 constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames WIND_MID
 constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames WIND_BOTTOM
 constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames RODS
+constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames MUSHROOMS
 constant entity_model_parts net/minecraft/client/render/entity/model/EntityModelPartNames BONE
 
 target_method net/minecraft/client/model/ModelPart getChild (Ljava/lang/String;)Lnet/minecraft/client/model/ModelPart;
diff --git a/unpick-definitions/llama_variants.unpick b/unpick-definitions/llama_variants.unpick
deleted file mode 100644
index 8c752cf895..0000000000
--- a/unpick-definitions/llama_variants.unpick
+++ /dev/null
@@ -1,11 +0,0 @@
-v2
-
-constant llama_variants net/fabricmc/yarn/constants/LlamaVariants CREAMY
-constant llama_variants net/fabricmc/yarn/constants/LlamaVariants WHITE
-constant llama_variants net/fabricmc/yarn/constants/LlamaVariants BROWN
-constant llama_variants net/fabricmc/yarn/constants/LlamaVariants GRAY
-
-target_method net/minecraft/entity/passive/LlamaEntity setVariant (I)V
-	param 0 llama_variants
-target_method net/minecraft/entity/passive/LlamaEntity getVariant ()I
-    return llama_variants
\ No newline at end of file
diff --git a/unpick-definitions/parrot_variants.unpick b/unpick-definitions/parrot_variants.unpick
deleted file mode 100644
index e05f7a1422..0000000000
--- a/unpick-definitions/parrot_variants.unpick
+++ /dev/null
@@ -1,12 +0,0 @@
-v2
-
-constant parrot_variants net/fabricmc/yarn/constants/ParrotVariants RED_AND_BLUE
-constant parrot_variants net/fabricmc/yarn/constants/ParrotVariants BLUE
-constant parrot_variants net/fabricmc/yarn/constants/ParrotVariants GREEN
-constant parrot_variants net/fabricmc/yarn/constants/ParrotVariants YELLOW_AND_BLUE
-constant parrot_variants net/fabricmc/yarn/constants/ParrotVariants GRAY
-
-target_method net/minecraft/entity/passive/ParrotEntity setVariant (I)V
-	param 0 parrot_variants
-target_method net/minecraft/entity/passive/ParrotEntity getVariant ()I
-    return parrot_variants
\ No newline at end of file
diff --git a/unpick-definitions/rabbit_types.unpick b/unpick-definitions/rabbit_types.unpick
deleted file mode 100644
index fa251c0b06..0000000000
--- a/unpick-definitions/rabbit_types.unpick
+++ /dev/null
@@ -1,14 +0,0 @@
-v2
-
-constant rabbit_types net/minecraft/entity/passive/RabbitEntity BROWN_TYPE
-constant rabbit_types net/minecraft/entity/passive/RabbitEntity WHITE_TYPE
-constant rabbit_types net/minecraft/entity/passive/RabbitEntity BLACK_TYPE
-constant rabbit_types net/minecraft/entity/passive/RabbitEntity WHITE_SPOTTED_TYPE
-constant rabbit_types net/minecraft/entity/passive/RabbitEntity GOLD_TYPE
-constant rabbit_types net/minecraft/entity/passive/RabbitEntity SALT_TYPE
-constant rabbit_types net/minecraft/entity/passive/RabbitEntity KILLER_BUNNY_TYPE
-
-target_method net/minecraft/entity/passive/RabbitEntity setRabbitType (I)V
-	param 0 rabbit_types
-target_method net/minecraft/entity/passive/RabbitEntity getRabbitType ()I
-    return rabbit_types
\ No newline at end of file