diff --git a/patches/unapplied/server/Fix-MC-187716-Use-configured-height.patch b/patches/unapplied/server/Fix-MC-187716-Use-configured-height.patch
deleted file mode 100644
index f9a68e23c6..0000000000
--- a/patches/unapplied/server/Fix-MC-187716-Use-configured-height.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 15 Aug 2020 08:04:49 -0500
-Subject: [PATCH] Fix MC-187716 Use configured height
-
-
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
-@@ -0,0 +0,0 @@ public abstract class NetherCappedSurfaceBuilder extends SurfaceBuilder<SurfaceB
-         BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
-         BlockState blockState3 = chunk.getBlockState(mutableBlockPos.set(k, 128, m));
- 
--        for(int p = 127; p >= i; --p) {
-+        for(int p = height; p >= i; --p) { // Paper - fix MC-187716 - use configured height
-             mutableBlockPos.set(k, p, m);
-             BlockState blockState4 = chunk.getBlockState(mutableBlockPos);
-             if (blockState3.is(defaultBlock.getBlock()) && (blockState4.isAir() || blockState4 == defaultFluid)) {
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherForestSurfaceBuilder.java b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherForestSurfaceBuilder.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherForestSurfaceBuilder.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherForestSurfaceBuilder.java
-@@ -0,0 +0,0 @@ public class NetherForestSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBas
-         int o = -1;
-         BlockState blockState = surfaceBuilderBaseConfiguration.getUnderMaterial();
- 
--        for(int p = 127; p >= i; --p) {
-+        for(int p = height; p >= i; --p) { // Paper - fix MC-187716 - use configured height
-             mutableBlockPos.set(k, p, m);
-             BlockState blockState2 = surfaceBuilderBaseConfiguration.getTopMaterial();
-             BlockState blockState3 = chunk.getBlockState(mutableBlockPos);
-diff --git a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java
-+++ b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherSurfaceBuilder.java
-@@ -0,0 +0,0 @@ public class NetherSurfaceBuilder extends SurfaceBuilder<SurfaceBuilderBaseConfi
-         BlockState blockState = surfaceBuilderBaseConfiguration.getTopMaterial();
-         BlockState blockState2 = surfaceBuilderBaseConfiguration.getUnderMaterial();
- 
--        for(int p = 127; p >= i; --p) {
-+        for(int p = height; p >= i; --p) { // Paper - fix MC-187716 - use configured height
-             mutableBlockPos.set(k, p, m);
-             BlockState blockState3 = chunk.getBlockState(mutableBlockPos);
-             if (blockState3.isAir()) {
diff --git a/patches/unapplied/server/MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/unapplied/server/MC-29274-Fix-Wither-hostility-towards-players.patch
deleted file mode 100644
index 8e65af4a92..0000000000
--- a/patches/unapplied/server/MC-29274-Fix-Wither-hostility-towards-players.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: TheShermanTanker <tanksherman27@gmail.com>
-Date: Thu, 1 Oct 2020 01:11:03 +0800
-Subject: [PATCH] MC-29274: Fix Wither hostility towards players
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -0,0 +0,0 @@ public class PaperWorldConfig {
-     private void setUpdatePathfindingOnBlockUpdate() {
-         updatePathfindingOnBlockUpdate = getBoolean("update-pathfinding-on-block-update", this.updatePathfindingOnBlockUpdate);
-     }
-+
-+    public boolean fixWitherTargetingBug = false;
-+    private void witherSettings() {
-+        fixWitherTargetingBug = getBoolean("fix-wither-targeting-bug", false);
-+        log("Withers properly target players: " + fixWitherTargetingBug);
-+    }
- }
- 
-diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -0,0 +0,0 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
-         this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 8.0F));
-         this.goalSelector.addGoal(7, new RandomLookAroundGoal(this));
-         this.targetSelector.addGoal(1, new HurtByTargetGoal(this, new Class[0]));
-+        if(this.level.paperConfig.fixWitherTargetingBug) this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 0, false, false, null)); // Paper - Fix MC-29274
-         this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Mob.class, 0, false, false, WitherBoss.LIVING_ENTITY_SELECTOR));
-     }
-