diff --git a/src/block/VanillaBlocks.php b/src/block/VanillaBlocks.php
index 196816b30..8e5083f4b 100644
--- a/src/block/VanillaBlocks.php
+++ b/src/block/VanillaBlocks.php
@@ -750,8 +750,8 @@ use function strtolower;
  * @method static Water WATER()
  * @method static WaterCauldron WATER_CAULDRON()
  * @method static NetherVines WEEPING_VINES()
- * @method static WeightedPressurePlateHeavy WEIGHTED_PRESSURE_PLATE_HEAVY()
- * @method static WeightedPressurePlateLight WEIGHTED_PRESSURE_PLATE_LIGHT()
+ * @method static WeightedPressurePlate WEIGHTED_PRESSURE_PLATE_HEAVY()
+ * @method static WeightedPressurePlate WEIGHTED_PRESSURE_PLATE_LIGHT()
  * @method static Wheat WHEAT()
  * @method static Flower WHITE_TULIP()
  * @method static WitherRose WITHER_ROSE()
@@ -1115,14 +1115,14 @@ final class VanillaBlocks{
 		self::register("lily_pad", new WaterLily(new BID(Ids::LILY_PAD), "Lily Pad", new Info(BreakInfo::instant())));
 
 		$weightedPressurePlateBreakInfo = new Info(BreakInfo::pickaxe(0.5, ToolTier::WOOD));
-		self::register("weighted_pressure_plate_heavy", new WeightedPressurePlateHeavy(
+		self::register("weighted_pressure_plate_heavy", new WeightedPressurePlate(
 			new BID(Ids::WEIGHTED_PRESSURE_PLATE_HEAVY),
 			"Weighted Pressure Plate Heavy",
 			$weightedPressurePlateBreakInfo,
 			deactivationDelayTicks: 10,
 			signalStrengthFactor: 0.1
 		));
-		self::register("weighted_pressure_plate_light", new WeightedPressurePlateLight(
+		self::register("weighted_pressure_plate_light", new WeightedPressurePlate(
 			new BID(Ids::WEIGHTED_PRESSURE_PLATE_LIGHT),
 			"Weighted Pressure Plate Light",
 			$weightedPressurePlateBreakInfo,
diff --git a/src/block/WeightedPressurePlateHeavy.php b/src/block/WeightedPressurePlateHeavy.php
deleted file mode 100644
index 9a8d1c31b..000000000
--- a/src/block/WeightedPressurePlateHeavy.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block;
-
-/**
- * @deprecated
- */
-class WeightedPressurePlateHeavy extends WeightedPressurePlate{
-
-}
diff --git a/src/block/WeightedPressurePlateLight.php b/src/block/WeightedPressurePlateLight.php
deleted file mode 100644
index 85c13d438..000000000
--- a/src/block/WeightedPressurePlateLight.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\block;
-
-/**
- * @deprecated
- */
-class WeightedPressurePlateLight extends WeightedPressurePlate{
-
-}
diff --git a/src/block/utils/BannerPatternType.php b/src/block/utils/BannerPatternType.php
index 083fada1b..5131af754 100644
--- a/src/block/utils/BannerPatternType.php
+++ b/src/block/utils/BannerPatternType.php
@@ -23,54 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static BannerPatternType BORDER()
- * @method static BannerPatternType BRICKS()
- * @method static BannerPatternType CIRCLE()
- * @method static BannerPatternType CREEPER()
- * @method static BannerPatternType CROSS()
- * @method static BannerPatternType CURLY_BORDER()
- * @method static BannerPatternType DIAGONAL_LEFT()
- * @method static BannerPatternType DIAGONAL_RIGHT()
- * @method static BannerPatternType DIAGONAL_UP_LEFT()
- * @method static BannerPatternType DIAGONAL_UP_RIGHT()
- * @method static BannerPatternType FLOWER()
- * @method static BannerPatternType GRADIENT()
- * @method static BannerPatternType GRADIENT_UP()
- * @method static BannerPatternType HALF_HORIZONTAL()
- * @method static BannerPatternType HALF_HORIZONTAL_BOTTOM()
- * @method static BannerPatternType HALF_VERTICAL()
- * @method static BannerPatternType HALF_VERTICAL_RIGHT()
- * @method static BannerPatternType MOJANG()
- * @method static BannerPatternType RHOMBUS()
- * @method static BannerPatternType SKULL()
- * @method static BannerPatternType SMALL_STRIPES()
- * @method static BannerPatternType SQUARE_BOTTOM_LEFT()
- * @method static BannerPatternType SQUARE_BOTTOM_RIGHT()
- * @method static BannerPatternType SQUARE_TOP_LEFT()
- * @method static BannerPatternType SQUARE_TOP_RIGHT()
- * @method static BannerPatternType STRAIGHT_CROSS()
- * @method static BannerPatternType STRIPE_BOTTOM()
- * @method static BannerPatternType STRIPE_CENTER()
- * @method static BannerPatternType STRIPE_DOWNLEFT()
- * @method static BannerPatternType STRIPE_DOWNRIGHT()
- * @method static BannerPatternType STRIPE_LEFT()
- * @method static BannerPatternType STRIPE_MIDDLE()
- * @method static BannerPatternType STRIPE_RIGHT()
- * @method static BannerPatternType STRIPE_TOP()
- * @method static BannerPatternType TRIANGLES_BOTTOM()
- * @method static BannerPatternType TRIANGLES_TOP()
- * @method static BannerPatternType TRIANGLE_BOTTOM()
- * @method static BannerPatternType TRIANGLE_TOP()
- */
 enum BannerPatternType{
-	use LegacyEnumShimTrait;
-
 	case BORDER;
 	case BRICKS;
 	case CIRCLE;
diff --git a/src/block/utils/BellAttachmentType.php b/src/block/utils/BellAttachmentType.php
index 29b88a2c4..38057cf39 100644
--- a/src/block/utils/BellAttachmentType.php
+++ b/src/block/utils/BellAttachmentType.php
@@ -23,20 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static BellAttachmentType CEILING()
- * @method static BellAttachmentType FLOOR()
- * @method static BellAttachmentType ONE_WALL()
- * @method static BellAttachmentType TWO_WALLS()
- */
 enum BellAttachmentType{
-	use LegacyEnumShimTrait;
-
 	case CEILING;
 	case FLOOR;
 	case ONE_WALL;
diff --git a/src/block/utils/BrewingStandSlot.php b/src/block/utils/BrewingStandSlot.php
index 21500b1c9..c7d74d8da 100644
--- a/src/block/utils/BrewingStandSlot.php
+++ b/src/block/utils/BrewingStandSlot.php
@@ -24,19 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\block\utils;
 
 use pocketmine\block\inventory\BrewingStandInventory;
-use pocketmine\utils\LegacyEnumShimTrait;
 
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static BrewingStandSlot EAST()
- * @method static BrewingStandSlot NORTHWEST()
- * @method static BrewingStandSlot SOUTHWEST()
- */
 enum BrewingStandSlot{
-	use LegacyEnumShimTrait;
-
 	case EAST;
 	case NORTHWEST;
 	case SOUTHWEST;
diff --git a/src/block/utils/CopperOxidation.php b/src/block/utils/CopperOxidation.php
index ba9abeaed..51e803e96 100644
--- a/src/block/utils/CopperOxidation.php
+++ b/src/block/utils/CopperOxidation.php
@@ -23,20 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static CopperOxidation EXPOSED()
- * @method static CopperOxidation NONE()
- * @method static CopperOxidation OXIDIZED()
- * @method static CopperOxidation WEATHERED()
- */
 enum CopperOxidation : int{
-	use LegacyEnumShimTrait;
-
 	case NONE = 0;
 	case EXPOSED = 1;
 	case WEATHERED = 2;
diff --git a/src/block/utils/CoralType.php b/src/block/utils/CoralType.php
index cba3e8dde..be262fcfb 100644
--- a/src/block/utils/CoralType.php
+++ b/src/block/utils/CoralType.php
@@ -23,21 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static CoralType BRAIN()
- * @method static CoralType BUBBLE()
- * @method static CoralType FIRE()
- * @method static CoralType HORN()
- * @method static CoralType TUBE()
- */
 enum CoralType{
-	use LegacyEnumShimTrait;
-
 	case TUBE;
 	case BRAIN;
 	case BUBBLE;
diff --git a/src/block/utils/DirtType.php b/src/block/utils/DirtType.php
index 9bed30d1c..3c1fc8423 100644
--- a/src/block/utils/DirtType.php
+++ b/src/block/utils/DirtType.php
@@ -23,19 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static DirtType COARSE()
- * @method static DirtType NORMAL()
- * @method static DirtType ROOTED()
- */
 enum DirtType{
-	use LegacyEnumShimTrait;
-
 	case NORMAL;
 	case COARSE;
 	case ROOTED;
diff --git a/src/block/utils/DripleafState.php b/src/block/utils/DripleafState.php
index 4b0cedce7..c6d86b633 100644
--- a/src/block/utils/DripleafState.php
+++ b/src/block/utils/DripleafState.php
@@ -23,20 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static DripleafState FULL_TILT()
- * @method static DripleafState PARTIAL_TILT()
- * @method static DripleafState STABLE()
- * @method static DripleafState UNSTABLE()
- */
 enum DripleafState{
-	use LegacyEnumShimTrait;
-
 	case STABLE;
 	case UNSTABLE;
 	case PARTIAL_TILT;
diff --git a/src/block/utils/DyeColor.php b/src/block/utils/DyeColor.php
index 5b205eda5..c01aa9ac3 100644
--- a/src/block/utils/DyeColor.php
+++ b/src/block/utils/DyeColor.php
@@ -24,35 +24,12 @@ declare(strict_types=1);
 namespace pocketmine\block\utils;
 
 use pocketmine\color\Color;
-use pocketmine\utils\LegacyEnumShimTrait;
 use function spl_object_id;
 
 /**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static DyeColor BLACK()
- * @method static DyeColor BLUE()
- * @method static DyeColor BROWN()
- * @method static DyeColor CYAN()
- * @method static DyeColor GRAY()
- * @method static DyeColor GREEN()
- * @method static DyeColor LIGHT_BLUE()
- * @method static DyeColor LIGHT_GRAY()
- * @method static DyeColor LIME()
- * @method static DyeColor MAGENTA()
- * @method static DyeColor ORANGE()
- * @method static DyeColor PINK()
- * @method static DyeColor PURPLE()
- * @method static DyeColor RED()
- * @method static DyeColor WHITE()
- * @method static DyeColor YELLOW()
- *
  * @phpstan-type TMetadata array{0: string, 1: Color}
  */
 enum DyeColor{
-	use LegacyEnumShimTrait;
-
 	case WHITE;
 	case ORANGE;
 	case MAGENTA;
diff --git a/src/block/utils/FroglightType.php b/src/block/utils/FroglightType.php
index ab20d31ac..73b293d4b 100644
--- a/src/block/utils/FroglightType.php
+++ b/src/block/utils/FroglightType.php
@@ -23,19 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static FroglightType OCHRE()
- * @method static FroglightType PEARLESCENT()
- * @method static FroglightType VERDANT()
- */
 enum FroglightType{
-	use LegacyEnumShimTrait;
-
 	case OCHRE;
 	case PEARLESCENT;
 	case VERDANT;
diff --git a/src/block/utils/LeavesType.php b/src/block/utils/LeavesType.php
index 975551ad6..f67dc8515 100644
--- a/src/block/utils/LeavesType.php
+++ b/src/block/utils/LeavesType.php
@@ -23,26 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static LeavesType ACACIA()
- * @method static LeavesType AZALEA()
- * @method static LeavesType BIRCH()
- * @method static LeavesType CHERRY()
- * @method static LeavesType DARK_OAK()
- * @method static LeavesType FLOWERING_AZALEA()
- * @method static LeavesType JUNGLE()
- * @method static LeavesType MANGROVE()
- * @method static LeavesType OAK()
- * @method static LeavesType SPRUCE()
- */
 enum LeavesType{
-	use LegacyEnumShimTrait;
-
 	case OAK;
 	case SPRUCE;
 	case BIRCH;
diff --git a/src/block/utils/LeverFacing.php b/src/block/utils/LeverFacing.php
index 1af92d6c4..6edb29376 100644
--- a/src/block/utils/LeverFacing.php
+++ b/src/block/utils/LeverFacing.php
@@ -24,24 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\block\utils;
 
 use pocketmine\math\Facing;
-use pocketmine\utils\LegacyEnumShimTrait;
 
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static LeverFacing DOWN_AXIS_X()
- * @method static LeverFacing DOWN_AXIS_Z()
- * @method static LeverFacing EAST()
- * @method static LeverFacing NORTH()
- * @method static LeverFacing SOUTH()
- * @method static LeverFacing UP_AXIS_X()
- * @method static LeverFacing UP_AXIS_Z()
- * @method static LeverFacing WEST()
- */
 enum LeverFacing{
-	use LegacyEnumShimTrait;
-
 	case UP_AXIS_X;
 	case UP_AXIS_Z;
 	case DOWN_AXIS_X;
diff --git a/src/block/utils/MobHeadType.php b/src/block/utils/MobHeadType.php
index af1fe1c4c..8b450bb94 100644
--- a/src/block/utils/MobHeadType.php
+++ b/src/block/utils/MobHeadType.php
@@ -23,23 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static MobHeadType CREEPER()
- * @method static MobHeadType DRAGON()
- * @method static MobHeadType PIGLIN()
- * @method static MobHeadType PLAYER()
- * @method static MobHeadType SKELETON()
- * @method static MobHeadType WITHER_SKELETON()
- * @method static MobHeadType ZOMBIE()
- */
 enum MobHeadType{
-	use LegacyEnumShimTrait;
-
 	case SKELETON;
 	case WITHER_SKELETON;
 	case ZOMBIE;
diff --git a/src/block/utils/MushroomBlockType.php b/src/block/utils/MushroomBlockType.php
index 6bc499b23..b4536088f 100644
--- a/src/block/utils/MushroomBlockType.php
+++ b/src/block/utils/MushroomBlockType.php
@@ -23,27 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static MushroomBlockType ALL_CAP()
- * @method static MushroomBlockType CAP_EAST()
- * @method static MushroomBlockType CAP_MIDDLE()
- * @method static MushroomBlockType CAP_NORTH()
- * @method static MushroomBlockType CAP_NORTHEAST()
- * @method static MushroomBlockType CAP_NORTHWEST()
- * @method static MushroomBlockType CAP_SOUTH()
- * @method static MushroomBlockType CAP_SOUTHEAST()
- * @method static MushroomBlockType CAP_SOUTHWEST()
- * @method static MushroomBlockType CAP_WEST()
- * @method static MushroomBlockType PORES()
- */
 enum MushroomBlockType{
-	use LegacyEnumShimTrait;
-
 	case PORES;
 	case CAP_NORTHWEST;
 	case CAP_NORTH;
diff --git a/src/block/utils/RecordType.php b/src/block/utils/RecordType.php
index e63cee920..ae96596ae 100644
--- a/src/block/utils/RecordType.php
+++ b/src/block/utils/RecordType.php
@@ -26,34 +26,12 @@ namespace pocketmine\block\utils;
 use pocketmine\lang\KnownTranslationFactory;
 use pocketmine\lang\Translatable;
 use pocketmine\network\mcpe\protocol\types\LevelSoundEvent;
-use pocketmine\utils\LegacyEnumShimTrait;
 use function spl_object_id;
 
 /**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static RecordType DISK_11()
- * @method static RecordType DISK_13()
- * @method static RecordType DISK_5()
- * @method static RecordType DISK_BLOCKS()
- * @method static RecordType DISK_CAT()
- * @method static RecordType DISK_CHIRP()
- * @method static RecordType DISK_FAR()
- * @method static RecordType DISK_MALL()
- * @method static RecordType DISK_MELLOHI()
- * @method static RecordType DISK_OTHERSIDE()
- * @method static RecordType DISK_PIGSTEP()
- * @method static RecordType DISK_STAL()
- * @method static RecordType DISK_STRAD()
- * @method static RecordType DISK_WAIT()
- * @method static RecordType DISK_WARD()
- *
  * @phpstan-type TMetadata array{0: string, 1: LevelSoundEvent::*, 2: Translatable}
  */
 enum RecordType{
-	use LegacyEnumShimTrait;
-
 	case DISK_13;
 	case DISK_5;
 	case DISK_CAT;
diff --git a/src/block/utils/SaplingType.php b/src/block/utils/SaplingType.php
index 9fe87936c..d8bd13e7c 100644
--- a/src/block/utils/SaplingType.php
+++ b/src/block/utils/SaplingType.php
@@ -23,23 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
 use pocketmine\world\generator\object\TreeType;
 
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static SaplingType ACACIA()
- * @method static SaplingType BIRCH()
- * @method static SaplingType DARK_OAK()
- * @method static SaplingType JUNGLE()
- * @method static SaplingType OAK()
- * @method static SaplingType SPRUCE()
- */
 enum SaplingType{
-	use LegacyEnumShimTrait;
-
 	case OAK;
 	case SPRUCE;
 	case BIRCH;
diff --git a/src/block/utils/SlabType.php b/src/block/utils/SlabType.php
index 90f3e0953..c79e4123c 100644
--- a/src/block/utils/SlabType.php
+++ b/src/block/utils/SlabType.php
@@ -23,19 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static SlabType BOTTOM()
- * @method static SlabType DOUBLE()
- * @method static SlabType TOP()
- */
 enum SlabType{
-	use LegacyEnumShimTrait;
-
 	case BOTTOM;
 	case TOP;
 	case DOUBLE;
diff --git a/src/block/utils/StairShape.php b/src/block/utils/StairShape.php
index b89b9adbb..4baf81dfe 100644
--- a/src/block/utils/StairShape.php
+++ b/src/block/utils/StairShape.php
@@ -23,21 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static StairShape INNER_LEFT()
- * @method static StairShape INNER_RIGHT()
- * @method static StairShape OUTER_LEFT()
- * @method static StairShape OUTER_RIGHT()
- * @method static StairShape STRAIGHT()
- */
 enum StairShape{
-	use LegacyEnumShimTrait;
-
 	case STRAIGHT;
 	case INNER_LEFT;
 	case INNER_RIGHT;
diff --git a/src/block/utils/SupportType.php b/src/block/utils/SupportType.php
index 9513d8640..52a7895a7 100644
--- a/src/block/utils/SupportType.php
+++ b/src/block/utils/SupportType.php
@@ -23,20 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static SupportType CENTER()
- * @method static SupportType EDGE()
- * @method static SupportType FULL()
- * @method static SupportType NONE()
- */
 enum SupportType{
-	use LegacyEnumShimTrait;
-
 	case FULL;
 	case CENTER;
 	case EDGE;
diff --git a/src/block/utils/WallConnectionType.php b/src/block/utils/WallConnectionType.php
index 1d4c8d152..e159abc8f 100644
--- a/src/block/utils/WallConnectionType.php
+++ b/src/block/utils/WallConnectionType.php
@@ -23,18 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static WallConnectionType SHORT()
- * @method static WallConnectionType TALL()
- */
 enum WallConnectionType{
-	use LegacyEnumShimTrait;
-
 	case SHORT;
 	case TALL;
 }
diff --git a/src/block/utils/WoodType.php b/src/block/utils/WoodType.php
index f6195b9f9..c376e14cd 100644
--- a/src/block/utils/WoodType.php
+++ b/src/block/utils/WoodType.php
@@ -23,26 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block\utils;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static WoodType ACACIA()
- * @method static WoodType BIRCH()
- * @method static WoodType CHERRY()
- * @method static WoodType CRIMSON()
- * @method static WoodType DARK_OAK()
- * @method static WoodType JUNGLE()
- * @method static WoodType MANGROVE()
- * @method static WoodType OAK()
- * @method static WoodType SPRUCE()
- * @method static WoodType WARPED()
- */
 enum WoodType{
-	use LegacyEnumShimTrait;
-
 	case OAK;
 	case SPRUCE;
 	case BIRCH;
diff --git a/src/crafting/FurnaceType.php b/src/crafting/FurnaceType.php
index 0ce5b72ce..7242cfef7 100644
--- a/src/crafting/FurnaceType.php
+++ b/src/crafting/FurnaceType.php
@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\crafting;
 
-use pocketmine\utils\LegacyEnumShimTrait;
 use pocketmine\world\sound\BlastFurnaceSound;
 use pocketmine\world\sound\FurnaceSound;
 use pocketmine\world\sound\SmokerSound;
@@ -31,18 +30,9 @@ use pocketmine\world\sound\Sound;
 use function spl_object_id;
 
 /**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static FurnaceType BLAST_FURNACE()
- * @method static FurnaceType FURNACE()
- * @method static FurnaceType SMOKER()
- *
  * @phpstan-type TMetadata array{0: int, 1: Sound}
  */
 enum FurnaceType{
-	use LegacyEnumShimTrait;
-
 	case FURNACE;
 	case BLAST_FURNACE;
 	case SMOKER;
diff --git a/src/crafting/ShapelessRecipeType.php b/src/crafting/ShapelessRecipeType.php
index 4f4624a4b..5db8a8128 100644
--- a/src/crafting/ShapelessRecipeType.php
+++ b/src/crafting/ShapelessRecipeType.php
@@ -23,20 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\crafting;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static ShapelessRecipeType CARTOGRAPHY()
- * @method static ShapelessRecipeType CRAFTING()
- * @method static ShapelessRecipeType SMITHING()
- * @method static ShapelessRecipeType STONECUTTER()
- */
 enum ShapelessRecipeType{
-	use LegacyEnumShimTrait;
-
 	case CRAFTING;
 	case STONECUTTER;
 	case SMITHING;
diff --git a/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php b/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
index eb51b9b0b..bf35bed69 100644
--- a/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
+++ b/src/data/bedrock/block/convert/BlockObjectToStateSerializer.php
@@ -153,8 +153,7 @@ use pocketmine\block\WallBanner;
 use pocketmine\block\WallCoralFan;
 use pocketmine\block\WallSign;
 use pocketmine\block\Water;
-use pocketmine\block\WeightedPressurePlateHeavy;
-use pocketmine\block\WeightedPressurePlateLight;
+use pocketmine\block\WeightedPressurePlate;
 use pocketmine\block\Wheat;
 use pocketmine\block\Wood;
 use pocketmine\block\WoodenButton;
@@ -1608,11 +1607,11 @@ final class BlockObjectToStateSerializer implements BlockStateSerializer{
 			return Writer::create(Ids::WEEPING_VINES)
 				->writeInt(StateNames::WEEPING_VINES_AGE, $block->getAge());
 		});
-		$this->map(Blocks::WEIGHTED_PRESSURE_PLATE_HEAVY(), function(WeightedPressurePlateHeavy $block) : Writer{
+		$this->map(Blocks::WEIGHTED_PRESSURE_PLATE_HEAVY(), function(WeightedPressurePlate $block) : Writer{
 			return Writer::create(Ids::HEAVY_WEIGHTED_PRESSURE_PLATE)
 				->writeInt(StateNames::REDSTONE_SIGNAL, $block->getOutputSignalStrength());
 		});
-		$this->map(Blocks::WEIGHTED_PRESSURE_PLATE_LIGHT(), function(WeightedPressurePlateLight $block) : Writer{
+		$this->map(Blocks::WEIGHTED_PRESSURE_PLATE_LIGHT(), function(WeightedPressurePlate $block) : Writer{
 			return Writer::create(Ids::LIGHT_WEIGHTED_PRESSURE_PLATE)
 				->writeInt(StateNames::REDSTONE_SIGNAL, $block->getOutputSignalStrength());
 		});
diff --git a/src/data/runtime/LegacyRuntimeEnumDescriberTrait.php b/src/data/runtime/LegacyRuntimeEnumDescriberTrait.php
deleted file mode 100644
index dd35fabfb..000000000
--- a/src/data/runtime/LegacyRuntimeEnumDescriberTrait.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\data\runtime;
-
-/**
- * Provides backwards-compatible shims for the old codegen'd enum describer methods.
- * This is kept for plugin backwards compatibility, but these functions should not be used in new code.
- * @deprecated
- */
-trait LegacyRuntimeEnumDescriberTrait{
-
-	/**
-	 * @phpstan-template T of \UnitEnum
-	 * @phpstan-param T $case
-	 */
-	abstract protected function enum(\UnitEnum &$case) : void;
-
-	public function bellAttachmentType(\pocketmine\block\utils\BellAttachmentType &$value) : void{
-		$this->enum($value);
-	}
-
-	public function copperOxidation(\pocketmine\block\utils\CopperOxidation &$value) : void{
-		$this->enum($value);
-	}
-
-	public function coralType(\pocketmine\block\utils\CoralType &$value) : void{
-		$this->enum($value);
-	}
-
-	public function dirtType(\pocketmine\block\utils\DirtType &$value) : void{
-		$this->enum($value);
-	}
-
-	public function dripleafState(\pocketmine\block\utils\DripleafState &$value) : void{
-		$this->enum($value);
-	}
-
-	public function dyeColor(\pocketmine\block\utils\DyeColor &$value) : void{
-		$this->enum($value);
-	}
-
-	public function froglightType(\pocketmine\block\utils\FroglightType &$value) : void{
-		$this->enum($value);
-	}
-
-	public function leverFacing(\pocketmine\block\utils\LeverFacing &$value) : void{
-		$this->enum($value);
-	}
-
-	public function medicineType(\pocketmine\item\MedicineType &$value) : void{
-		$this->enum($value);
-	}
-
-	public function mobHeadType(\pocketmine\block\utils\MobHeadType &$value) : void{
-		$this->enum($value);
-	}
-
-	public function mushroomBlockType(\pocketmine\block\utils\MushroomBlockType &$value) : void{
-		$this->enum($value);
-	}
-
-	public function potionType(\pocketmine\item\PotionType &$value) : void{
-		$this->enum($value);
-	}
-
-	public function slabType(\pocketmine\block\utils\SlabType &$value) : void{
-		$this->enum($value);
-	}
-
-	public function suspiciousStewType(\pocketmine\item\SuspiciousStewType &$value) : void{
-		$this->enum($value);
-	}
-}
diff --git a/src/data/runtime/RuntimeDataDescriber.php b/src/data/runtime/RuntimeDataDescriber.php
index 2d8c52ec2..13de66eba 100644
--- a/src/data/runtime/RuntimeDataDescriber.php
+++ b/src/data/runtime/RuntimeDataDescriber.php
@@ -35,7 +35,7 @@ use pocketmine\math\Facing;
  * You may use it as a type for parameters and return values, but it should not be implemented outside of this package.
  * New methods may be added without warning.
  */
-interface RuntimeDataDescriber extends RuntimeEnumDescriber{
+interface RuntimeDataDescriber{
 	public function int(int $bits, int &$value) : void;
 
 	public function boundedInt(int $bits, int $min, int $max, int &$value) : void;
diff --git a/src/data/runtime/RuntimeDataReader.php b/src/data/runtime/RuntimeDataReader.php
index 9b6445073..1c75eae21 100644
--- a/src/data/runtime/RuntimeDataReader.php
+++ b/src/data/runtime/RuntimeDataReader.php
@@ -34,8 +34,6 @@ use function intdiv;
 use function spl_object_id;
 
 final class RuntimeDataReader implements RuntimeDataDescriber{
-	use LegacyRuntimeEnumDescriberTrait;
-
 	private int $offset = 0;
 
 	public function __construct(
diff --git a/src/data/runtime/RuntimeDataSizeCalculator.php b/src/data/runtime/RuntimeDataSizeCalculator.php
index 82e360213..2594d7d9a 100644
--- a/src/data/runtime/RuntimeDataSizeCalculator.php
+++ b/src/data/runtime/RuntimeDataSizeCalculator.php
@@ -28,8 +28,6 @@ use pocketmine\math\Facing;
 use function count;
 
 final class RuntimeDataSizeCalculator implements RuntimeDataDescriber{
-	use LegacyRuntimeEnumDescriberTrait;
-
 	private int $bits = 0;
 
 	protected function addBits(int $bits) : void{
diff --git a/src/data/runtime/RuntimeDataWriter.php b/src/data/runtime/RuntimeDataWriter.php
index 9e78875ea..2fb11fc87 100644
--- a/src/data/runtime/RuntimeDataWriter.php
+++ b/src/data/runtime/RuntimeDataWriter.php
@@ -31,8 +31,6 @@ use function array_flip;
 use function spl_object_id;
 
 final class RuntimeDataWriter implements RuntimeDataDescriber{
-	use LegacyRuntimeEnumDescriberTrait;
-
 	private int $value = 0;
 	private int $offset = 0;
 
diff --git a/src/data/runtime/RuntimeEnumDescriber.php b/src/data/runtime/RuntimeEnumDescriber.php
deleted file mode 100644
index 79550d041..000000000
--- a/src/data/runtime/RuntimeEnumDescriber.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\data\runtime;
-
-/**
- * Provides backwards-compatible shims for the old codegen'd enum describer methods.
- * This is kept for plugin backwards compatibility, but these functions should not be used in new code.
- * @deprecated
- */
-interface RuntimeEnumDescriber{
-
-	public function bellAttachmentType(\pocketmine\block\utils\BellAttachmentType &$value) : void;
-
-	public function copperOxidation(\pocketmine\block\utils\CopperOxidation &$value) : void;
-
-	public function coralType(\pocketmine\block\utils\CoralType &$value) : void;
-
-	public function dirtType(\pocketmine\block\utils\DirtType &$value) : void;
-
-	public function dripleafState(\pocketmine\block\utils\DripleafState &$value) : void;
-
-	public function dyeColor(\pocketmine\block\utils\DyeColor &$value) : void;
-
-	public function froglightType(\pocketmine\block\utils\FroglightType &$value) : void;
-
-	public function leverFacing(\pocketmine\block\utils\LeverFacing &$value) : void;
-
-	public function medicineType(\pocketmine\item\MedicineType &$value) : void;
-
-	public function mobHeadType(\pocketmine\block\utils\MobHeadType &$value) : void;
-
-	public function mushroomBlockType(\pocketmine\block\utils\MushroomBlockType &$value) : void;
-
-	public function potionType(\pocketmine\item\PotionType &$value) : void;
-
-	public function slabType(\pocketmine\block\utils\SlabType &$value) : void;
-
-	public function suspiciousStewType(\pocketmine\item\SuspiciousStewType &$value) : void;
-
-}
diff --git a/src/item/BoatType.php b/src/item/BoatType.php
index 518a1324e..6c257bf0e 100644
--- a/src/item/BoatType.php
+++ b/src/item/BoatType.php
@@ -24,23 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 use pocketmine\block\utils\WoodType;
-use pocketmine\utils\LegacyEnumShimTrait;
 
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static BoatType ACACIA()
- * @method static BoatType BIRCH()
- * @method static BoatType DARK_OAK()
- * @method static BoatType JUNGLE()
- * @method static BoatType MANGROVE()
- * @method static BoatType OAK()
- * @method static BoatType SPRUCE()
- */
 enum BoatType{
-	use LegacyEnumShimTrait;
-
 	case OAK;
 	case SPRUCE;
 	case BIRCH;
diff --git a/src/item/ItemUseResult.php b/src/item/ItemUseResult.php
index e3fbe10fb..a7da91974 100644
--- a/src/item/ItemUseResult.php
+++ b/src/item/ItemUseResult.php
@@ -23,19 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static ItemUseResult FAIL()
- * @method static ItemUseResult NONE()
- * @method static ItemUseResult SUCCESS()
- */
 enum ItemUseResult{
-	use LegacyEnumShimTrait;
-
 	case NONE;
 	case FAIL;
 	case SUCCESS;
diff --git a/src/item/MedicineType.php b/src/item/MedicineType.php
index ea99bb75d..8d40eb74f 100644
--- a/src/item/MedicineType.php
+++ b/src/item/MedicineType.php
@@ -25,20 +25,8 @@ namespace pocketmine\item;
 
 use pocketmine\entity\effect\Effect;
 use pocketmine\entity\effect\VanillaEffects;
-use pocketmine\utils\LegacyEnumShimTrait;
 
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static MedicineType ANTIDOTE()
- * @method static MedicineType ELIXIR()
- * @method static MedicineType EYE_DROPS()
- * @method static MedicineType TONIC()
- */
 enum MedicineType{
-	use LegacyEnumShimTrait;
-
 	case ANTIDOTE;
 	case ELIXIR;
 	case EYE_DROPS;
diff --git a/src/item/PotionType.php b/src/item/PotionType.php
index 3f4773e6d..8200eb038 100644
--- a/src/item/PotionType.php
+++ b/src/item/PotionType.php
@@ -25,62 +25,12 @@ namespace pocketmine\item;
 
 use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\effect\VanillaEffects;
-use pocketmine\utils\LegacyEnumShimTrait;
 use function spl_object_id;
 
 /**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static PotionType AWKWARD()
- * @method static PotionType FIRE_RESISTANCE()
- * @method static PotionType HARMING()
- * @method static PotionType HEALING()
- * @method static PotionType INVISIBILITY()
- * @method static PotionType LEAPING()
- * @method static PotionType LONG_FIRE_RESISTANCE()
- * @method static PotionType LONG_INVISIBILITY()
- * @method static PotionType LONG_LEAPING()
- * @method static PotionType LONG_MUNDANE()
- * @method static PotionType LONG_NIGHT_VISION()
- * @method static PotionType LONG_POISON()
- * @method static PotionType LONG_REGENERATION()
- * @method static PotionType LONG_SLOWNESS()
- * @method static PotionType LONG_SLOW_FALLING()
- * @method static PotionType LONG_STRENGTH()
- * @method static PotionType LONG_SWIFTNESS()
- * @method static PotionType LONG_TURTLE_MASTER()
- * @method static PotionType LONG_WATER_BREATHING()
- * @method static PotionType LONG_WEAKNESS()
- * @method static PotionType MUNDANE()
- * @method static PotionType NIGHT_VISION()
- * @method static PotionType POISON()
- * @method static PotionType REGENERATION()
- * @method static PotionType SLOWNESS()
- * @method static PotionType SLOW_FALLING()
- * @method static PotionType STRENGTH()
- * @method static PotionType STRONG_HARMING()
- * @method static PotionType STRONG_HEALING()
- * @method static PotionType STRONG_LEAPING()
- * @method static PotionType STRONG_POISON()
- * @method static PotionType STRONG_REGENERATION()
- * @method static PotionType STRONG_SLOWNESS()
- * @method static PotionType STRONG_STRENGTH()
- * @method static PotionType STRONG_SWIFTNESS()
- * @method static PotionType STRONG_TURTLE_MASTER()
- * @method static PotionType SWIFTNESS()
- * @method static PotionType THICK()
- * @method static PotionType TURTLE_MASTER()
- * @method static PotionType WATER()
- * @method static PotionType WATER_BREATHING()
- * @method static PotionType WEAKNESS()
- * @method static PotionType WITHER()
- *
  * @phpstan-type TMetadata array{0: string, 1: \Closure() : list<EffectInstance>}
  */
 enum PotionType{
-	use LegacyEnumShimTrait;
-
 	case WATER;
 	case MUNDANE;
 	case LONG_MUNDANE;
diff --git a/src/item/SuspiciousStewType.php b/src/item/SuspiciousStewType.php
index d53b82a3f..52290a522 100644
--- a/src/item/SuspiciousStewType.php
+++ b/src/item/SuspiciousStewType.php
@@ -25,26 +25,8 @@ namespace pocketmine\item;
 
 use pocketmine\entity\effect\EffectInstance;
 use pocketmine\entity\effect\VanillaEffects;
-use pocketmine\utils\LegacyEnumShimTrait;
 
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static SuspiciousStewType ALLIUM()
- * @method static SuspiciousStewType AZURE_BLUET()
- * @method static SuspiciousStewType BLUE_ORCHID()
- * @method static SuspiciousStewType CORNFLOWER()
- * @method static SuspiciousStewType DANDELION()
- * @method static SuspiciousStewType LILY_OF_THE_VALLEY()
- * @method static SuspiciousStewType OXEYE_DAISY()
- * @method static SuspiciousStewType POPPY()
- * @method static SuspiciousStewType TULIP()
- * @method static SuspiciousStewType WITHER_ROSE()
- */
 enum SuspiciousStewType{
-	use LegacyEnumShimTrait;
-
 	case POPPY;
 	case CORNFLOWER;
 	case TULIP;
diff --git a/src/item/ToolTier.php b/src/item/ToolTier.php
index 6c7161c33..e9282eb13 100644
--- a/src/item/ToolTier.php
+++ b/src/item/ToolTier.php
@@ -23,26 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\item;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
 /**
- * This doc-block is generated automatically, do not modify it manually.
- * This must be regenerated whenever registry members are added, removed or changed.
- * @see build/generate-registry-annotations.php
- * @generate-registry-docblock
- *
- * @method static ToolTier DIAMOND()
- * @method static ToolTier GOLD()
- * @method static ToolTier IRON()
- * @method static ToolTier NETHERITE()
- * @method static ToolTier STONE()
- * @method static ToolTier WOOD()
- *
  * @phpstan-type TMetadata array{0: int, 1: int, 2: int, 3: int, 4: int}
  */
 enum ToolTier{
-	use LegacyEnumShimTrait;
-
 	case WOOD;
 	case GOLD;
 	case STONE;
diff --git a/src/item/enchantment/Enchantment.php b/src/item/enchantment/Enchantment.php
index 948f4648b..e8335d5f3 100644
--- a/src/item/enchantment/Enchantment.php
+++ b/src/item/enchantment/Enchantment.php
@@ -44,15 +44,11 @@ class Enchantment{
 	/**
 	 * @phpstan-param null|(\Closure(int $level) : int) $minEnchantingPower
 	 *
-	 * @param int $primaryItemFlags     @deprecated
-	 * @param int $secondaryItemFlags   @deprecated
 	 * @param int $enchantingPowerRange Value used to calculate the maximum enchanting power (minEnchantingPower + enchantingPowerRange)
 	 */
 	public function __construct(
 		private Translatable|string $name,
 		private int $rarity,
-		private int $primaryItemFlags,
-		private int $secondaryItemFlags,
 		private int $maxLevel,
 		?\Closure $minEnchantingPower = null,
 		private int $enchantingPowerRange = 50
@@ -79,47 +75,6 @@ class Enchantment{
 		return $this->rarity;
 	}
 
-	/**
-	 * Returns a bitset indicating what item types can have this item applied from an enchanting table.
-	 *
-	 * @deprecated
-	 * @see AvailableEnchantmentRegistry::getPrimaryItemTags()
-	 */
-	public function getPrimaryItemFlags() : int{
-		return $this->primaryItemFlags;
-	}
-
-	/**
-	 * Returns a bitset indicating what item types cannot have this item applied from an enchanting table, but can from
-	 * an anvil.
-	 *
-	 * @deprecated
-	 * @see AvailableEnchantmentRegistry::getSecondaryItemTags()
-	 */
-	public function getSecondaryItemFlags() : int{
-		return $this->secondaryItemFlags;
-	}
-
-	/**
-	 * Returns whether this enchantment can apply to the item type from an enchanting table.
-	 *
-	 * @deprecated
-	 * @see AvailableEnchantmentRegistry
-	 */
-	public function hasPrimaryItemType(int $flag) : bool{
-		return ($this->primaryItemFlags & $flag) !== 0;
-	}
-
-	/**
-	 * Returns whether this enchantment can apply to the item type from an anvil, if it is not a primary item.
-	 *
-	 * @deprecated
-	 * @see AvailableEnchantmentRegistry
-	 */
-	public function hasSecondaryItemType(int $flag) : bool{
-		return ($this->secondaryItemFlags & $flag) !== 0;
-	}
-
 	/**
 	 * Returns the maximum level of this enchantment that can be found on an enchantment table.
 	 */
diff --git a/src/item/enchantment/ItemFlags.php b/src/item/enchantment/ItemFlags.php
deleted file mode 100644
index 5e4ad4d7d..000000000
--- a/src/item/enchantment/ItemFlags.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\item\enchantment;
-
-/** @deprecated */
-final class ItemFlags{
-
-	private function __construct(){
-		//NOOP
-	}
-
-	public const NONE = 0x0;
-	public const ALL = 0xffff;
-	public const ARMOR = self::HEAD | self::TORSO | self::LEGS | self::FEET;
-	public const HEAD = 0x1;
-	public const TORSO = 0x2;
-	public const LEGS = 0x4;
-	public const FEET = 0x8;
-	public const SWORD = 0x10;
-	public const BOW = 0x20;
-	public const TOOL = self::HOE | self::SHEARS | self::FLINT_AND_STEEL;
-	public const HOE = 0x40;
-	public const SHEARS = 0x80;
-	public const FLINT_AND_STEEL = 0x100;
-	public const DIG = self::AXE | self::PICKAXE | self::SHOVEL;
-	public const AXE = 0x200;
-	public const PICKAXE = 0x400;
-	public const SHOVEL = 0x800;
-	public const FISHING_ROD = 0x1000;
-	public const CARROT_STICK = 0x2000;
-	public const ELYTRA = 0x4000;
-	public const TRIDENT = 0x8000;
-}
diff --git a/src/item/enchantment/ProtectionEnchantment.php b/src/item/enchantment/ProtectionEnchantment.php
index be78a2306..f7a117117 100644
--- a/src/item/enchantment/ProtectionEnchantment.php
+++ b/src/item/enchantment/ProtectionEnchantment.php
@@ -38,13 +38,11 @@ class ProtectionEnchantment extends Enchantment{
 	 *
 	 * @phpstan-param null|(\Closure(int $level) : int) $minEnchantingPower
 	 *
-	 * @param int        $primaryItemFlags      @deprecated
-	 * @param int        $secondaryItemFlags    @deprecated
 	 * @param int[]|null $applicableDamageTypes EntityDamageEvent::CAUSE_* constants which this enchantment type applies to, or null if it applies to all types of damage.
 	 * @param int        $enchantingPowerRange  Value used to calculate the maximum enchanting power (minEnchantingPower + enchantingPowerRange)
 	 */
-	public function __construct(Translatable|string $name, int $rarity, int $primaryItemFlags, int $secondaryItemFlags, int $maxLevel, float $typeModifier, ?array $applicableDamageTypes, ?\Closure $minEnchantingPower = null, int $enchantingPowerRange = 50){
-		parent::__construct($name, $rarity, $primaryItemFlags, $secondaryItemFlags, $maxLevel, $minEnchantingPower, $enchantingPowerRange);
+	public function __construct(Translatable|string $name, int $rarity, int $maxLevel, float $typeModifier, ?array $applicableDamageTypes, ?\Closure $minEnchantingPower = null, int $enchantingPowerRange = 50){
+		parent::__construct($name, $rarity, $maxLevel, $minEnchantingPower, $enchantingPowerRange);
 
 		$this->typeModifier = $typeModifier;
 		if($applicableDamageTypes !== null){
diff --git a/src/item/enchantment/VanillaEnchantments.php b/src/item/enchantment/VanillaEnchantments.php
index 779098c77..bfb9e3e92 100644
--- a/src/item/enchantment/VanillaEnchantments.php
+++ b/src/item/enchantment/VanillaEnchantments.php
@@ -62,8 +62,6 @@ final class VanillaEnchantments{
 		self::register("PROTECTION", new ProtectionEnchantment(
 			KnownTranslationFactory::enchantment_protect_all(),
 			Rarity::COMMON,
-			0,
-			0,
 			4,
 			0.75,
 			null,
@@ -73,8 +71,6 @@ final class VanillaEnchantments{
 		self::register("FIRE_PROTECTION", new ProtectionEnchantment(
 			KnownTranslationFactory::enchantment_protect_fire(),
 			Rarity::UNCOMMON,
-			0,
-			0,
 			4,
 			1.25,
 			[
@@ -89,8 +85,6 @@ final class VanillaEnchantments{
 		self::register("FEATHER_FALLING", new ProtectionEnchantment(
 			KnownTranslationFactory::enchantment_protect_fall(),
 			Rarity::UNCOMMON,
-			0,
-			0,
 			4,
 			2.5,
 			[
@@ -102,8 +96,6 @@ final class VanillaEnchantments{
 		self::register("BLAST_PROTECTION", new ProtectionEnchantment(
 			KnownTranslationFactory::enchantment_protect_explosion(),
 			Rarity::RARE,
-			0,
-			0,
 			4,
 			1.5,
 			[
@@ -116,8 +108,6 @@ final class VanillaEnchantments{
 		self::register("PROJECTILE_PROTECTION", new ProtectionEnchantment(
 			KnownTranslationFactory::enchantment_protect_projectile(),
 			Rarity::UNCOMMON,
-			0,
-			0,
 			4,
 			1.5,
 			[
@@ -129,8 +119,6 @@ final class VanillaEnchantments{
 		self::register("THORNS", new Enchantment(
 			KnownTranslationFactory::enchantment_thorns(),
 			Rarity::MYTHIC,
-			0,
-			0,
 			3,
 			fn(int $level) : int => 20 * ($level - 1) + 10,
 			50
@@ -138,8 +126,6 @@ final class VanillaEnchantments{
 		self::register("RESPIRATION", new Enchantment(
 			KnownTranslationFactory::enchantment_oxygen(),
 			Rarity::RARE,
-			0,
-			0,
 			3,
 			fn(int $level) : int => 10 * $level,
 			30
@@ -148,8 +134,6 @@ final class VanillaEnchantments{
 		self::register("SHARPNESS", new SharpnessEnchantment(
 			KnownTranslationFactory::enchantment_damage_all(),
 			Rarity::COMMON,
-			0,
-			0,
 			5,
 			fn(int $level) : int => 11 * ($level - 1) + 1,
 			20
@@ -157,8 +141,6 @@ final class VanillaEnchantments{
 		self::register("KNOCKBACK", new KnockbackEnchantment(
 			KnownTranslationFactory::enchantment_knockback(),
 			Rarity::UNCOMMON,
-			0,
-			0,
 			2,
 			fn(int $level) : int => 20 * ($level - 1) + 5,
 			50
@@ -166,8 +148,6 @@ final class VanillaEnchantments{
 		self::register("FIRE_ASPECT", new FireAspectEnchantment(
 			KnownTranslationFactory::enchantment_fire(),
 			Rarity::RARE,
-			0,
-			0,
 			2,
 			fn(int $level) : int => 20 * ($level - 1) + 10,
 			50
@@ -177,8 +157,6 @@ final class VanillaEnchantments{
 		self::register("EFFICIENCY", new Enchantment(
 			KnownTranslationFactory::enchantment_digging(),
 			Rarity::COMMON,
-			0,
-			0,
 			5,
 			fn(int $level) : int => 10 * ($level - 1) + 1,
 			50
@@ -186,8 +164,6 @@ final class VanillaEnchantments{
 		self::register("FORTUNE", new Enchantment(
 			KnownTranslationFactory::enchantment_lootBonusDigger(),
 			Rarity::RARE,
-			0,
-			0,
 			3,
 			fn(int $level) : int => 9 * ($level - 1) + 15,
 			50
@@ -195,8 +171,6 @@ final class VanillaEnchantments{
 		self::register("SILK_TOUCH", new Enchantment(
 			KnownTranslationFactory::enchantment_untouching(),
 			Rarity::MYTHIC,
-			0,
-			0,
 			1,
 			fn(int $level) : int => 15,
 			50
@@ -204,8 +178,6 @@ final class VanillaEnchantments{
 		self::register("UNBREAKING", new Enchantment(
 			KnownTranslationFactory::enchantment_durability(),
 			Rarity::UNCOMMON,
-			0,
-			0,
 			3,
 			fn(int $level) : int => 8 * ($level - 1) + 5,
 			50
@@ -214,8 +186,6 @@ final class VanillaEnchantments{
 		self::register("POWER", new Enchantment(
 			KnownTranslationFactory::enchantment_arrowDamage(),
 			Rarity::COMMON,
-			0,
-			0,
 			5,
 			fn(int $level) : int => 10 * ($level - 1) + 1,
 			15
@@ -223,8 +193,6 @@ final class VanillaEnchantments{
 		self::register("PUNCH", new Enchantment(
 			KnownTranslationFactory::enchantment_arrowKnockback(),
 			Rarity::RARE,
-			0,
-			0,
 			2,
 			fn(int $level) : int => 20 * ($level - 1) + 12,
 			25
@@ -232,8 +200,6 @@ final class VanillaEnchantments{
 		self::register("FLAME", new Enchantment(
 			KnownTranslationFactory::enchantment_arrowFire(),
 			Rarity::RARE,
-			0,
-			0,
 			1,
 			fn(int $level) : int => 20,
 			30
@@ -241,8 +207,6 @@ final class VanillaEnchantments{
 		self::register("INFINITY", new Enchantment(
 			KnownTranslationFactory::enchantment_arrowInfinite(),
 			Rarity::MYTHIC,
-			0,
-			0,
 			1,
 			fn(int $level) : int => 20,
 			30
@@ -251,8 +215,6 @@ final class VanillaEnchantments{
 		self::register("MENDING", new Enchantment(
 			KnownTranslationFactory::enchantment_mending(),
 			Rarity::RARE,
-			0,
-			0,
 			1,
 			fn(int $level) : int => 25,
 			50
@@ -261,8 +223,6 @@ final class VanillaEnchantments{
 		self::register("VANISHING", new Enchantment(
 			KnownTranslationFactory::enchantment_curse_vanishing(),
 			Rarity::MYTHIC,
-			0,
-			0,
 			1,
 			fn(int $level) : int => 25,
 			25
@@ -271,8 +231,6 @@ final class VanillaEnchantments{
 		self::register("SWIFT_SNEAK", new Enchantment(
 			KnownTranslationFactory::enchantment_swift_sneak(),
 			Rarity::MYTHIC,
-			0,
-			0,
 			3,
 			fn(int $level) : int => 10 * $level,
 			5
diff --git a/src/player/UsedChunkStatus.php b/src/player/UsedChunkStatus.php
index dda41fe7e..ad80fe084 100644
--- a/src/player/UsedChunkStatus.php
+++ b/src/player/UsedChunkStatus.php
@@ -23,20 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\player;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static UsedChunkStatus NEEDED()
- * @method static UsedChunkStatus REQUESTED_GENERATION()
- * @method static UsedChunkStatus REQUESTED_SENDING()
- * @method static UsedChunkStatus SENT()
- */
 enum UsedChunkStatus{
-	use LegacyEnumShimTrait;
-
 	case NEEDED;
 	case REQUESTED_GENERATION;
 	case REQUESTED_SENDING;
diff --git a/src/utils/EnumTrait.php b/src/utils/EnumTrait.php
index ee1bd4e35..e03ec1f06 100644
--- a/src/utils/EnumTrait.php
+++ b/src/utils/EnumTrait.php
@@ -30,8 +30,7 @@ namespace pocketmine\utils;
  * Classes using this trait need to include \@method tags in their class docblock for every enum member.
  * Alternatively, just put \@generate-registry-docblock in the docblock and run tools/generate-registry-annotations.php
  *
- * @deprecated Use native PHP 8.1 enums instead. Use {@link LegacyEnumShimTrait} if you need to provide backwards
- * compatible EnumTrait-like API for migrated enums.
+ * @deprecated Use native PHP 8.1 enums instead.
  */
 trait EnumTrait{
 	use RegistryTrait;
diff --git a/src/utils/LegacyEnumShimTrait.php b/src/utils/LegacyEnumShimTrait.php
deleted file mode 100644
index 4bb3587ab..000000000
--- a/src/utils/LegacyEnumShimTrait.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\utils;
-
-use function count;
-use function mb_strtoupper;
-use function spl_object_id;
-
-/**
- * Offers a shim to make a native enum behave similarly to a legacy {@link EnumTrait} enum.
- * Used to provide backwards compatibility for enums that have been migrated to native PHP 8.1 enums.
- *
- * @deprecated
- */
-trait LegacyEnumShimTrait{
-
-	/**
-	 * @param mixed[] $arguments
-	 */
-	public static function __callStatic(string $name, array $arguments) : self{
-		if(count($arguments) > 0){
-			throw new \ArgumentCountError("Expected exactly 0 arguments, " . count($arguments) . " passed");
-		}
-		return self::getAll()[mb_strtoupper($name)];
-	}
-
-	/**
-	 * Returns a list of all cases, indexed by name.
-	 *
-	 * @return self[]
-	 * @phpstan-return array<string, self>
-	 */
-	public static function getAll() : array{
-		/** @var array<string, self>|null $result */
-		static $result = null;
-		if($result === null){
-			$result = [];
-			foreach(self::cases() as $case){
-				$result[mb_strtoupper($case->name)] = $case;
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Shim for {@link \UnitEnum::name}.
-	 *
-	 * @deprecated Use the native enum's name property instead.
-	 */
-	public function name() : string{
-		return $this->name;
-	}
-
-	/**
-	 * Alias of spl_object_id($this).
-	 *
-	 * @deprecated
-	 */
-	public function id() : int{
-		return spl_object_id($this);
-	}
-
-	/**
-	 * Returns whether the two objects are equivalent.
-	 *
-	 * @deprecated Native enums can be safely compared with ===.
-	 */
-	public function equals(self $other) : bool{
-		return $this === $other;
-	}
-}
diff --git a/src/world/generator/object/TreeType.php b/src/world/generator/object/TreeType.php
index d4d62946a..62b933172 100644
--- a/src/world/generator/object/TreeType.php
+++ b/src/world/generator/object/TreeType.php
@@ -23,22 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\world\generator\object;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static TreeType ACACIA()
- * @method static TreeType BIRCH()
- * @method static TreeType DARK_OAK()
- * @method static TreeType JUNGLE()
- * @method static TreeType OAK()
- * @method static TreeType SPRUCE()
- */
 enum TreeType{
-	use LegacyEnumShimTrait;
-
 	case OAK;
 	case SPRUCE;
 	case BIRCH;
diff --git a/src/world/sound/NoteInstrument.php b/src/world/sound/NoteInstrument.php
index a91d52cf7..2536467b4 100644
--- a/src/world/sound/NoteInstrument.php
+++ b/src/world/sound/NoteInstrument.php
@@ -23,32 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\world\sound;
 
-use pocketmine\utils\LegacyEnumShimTrait;
-
-/**
- * TODO: These tags need to be removed once we get rid of LegacyEnumShimTrait (PM6)
- *  These are retained for backwards compatibility only.
- *
- * @method static NoteInstrument BANJO()
- * @method static NoteInstrument BASS_DRUM()
- * @method static NoteInstrument BELL()
- * @method static NoteInstrument BIT()
- * @method static NoteInstrument CHIME()
- * @method static NoteInstrument CLICKS_AND_STICKS()
- * @method static NoteInstrument COW_BELL()
- * @method static NoteInstrument DIDGERIDOO()
- * @method static NoteInstrument DOUBLE_BASS()
- * @method static NoteInstrument FLUTE()
- * @method static NoteInstrument GUITAR()
- * @method static NoteInstrument IRON_XYLOPHONE()
- * @method static NoteInstrument PIANO()
- * @method static NoteInstrument PLING()
- * @method static NoteInstrument SNARE()
- * @method static NoteInstrument XYLOPHONE()
- */
 enum NoteInstrument{
-	use LegacyEnumShimTrait;
-
 	case PIANO;
 	case BASS_DRUM;
 	case SNARE;