diff --git a/Spigot-Server-Patches/Lighting-Queue.patch b/Spigot-Server-Patches/Lighting-Queue.patch
index e745354d36..16d1b178a4 100644
--- a/Spigot-Server-Patches/Lighting-Queue.patch
+++ b/Spigot-Server-Patches/Lighting-Queue.patch
@@ -25,16 +25,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          log("Top of the nether void damage: " + netherVoidTopDamage);
      }
 +
-+    public int tickNextTickCap;
-+    public boolean tickNextTickListCapIgnoresRedstone;
-+    private void tickNextTickCap() {
-+        tickNextTickCap = getInt("tick-next-tick-list-cap", 1000); // Higher values will be friendlier to vanilla style mechanics (to a point) but may hurt performance
-+        tickNextTickListCapIgnoresRedstone = getBoolean("tick-next-tick-list-cap-ignores-redstone", false); // Redstone TickNextTicks will always bypass the preceding cap
-+        log("WorldServer TickNextTick cap set at " + tickNextTickCap);
-+        log("WorldServer TickNextTickList cap always processes redstone: " + tickNextTickListCapIgnoresRedstone);
-+
-+    }
-+
 +    public boolean queueLightUpdates;
 +    private void queueLightUpdates() {
 +        queueLightUpdates = getBoolean("queue-light-updates", false);
diff --git a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
index ab3988be6d..6149326ee4 100644
--- a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
@@ -65,7 +65,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +                double d0 = (double) this.position.getZ() + 0.5D;
 +                double d1 = (double) this.position.getX() + 0.5D;
-+                int yLoc = this.position.getY();
 +
 +                if (this.i != null) {
 +                    d0 += 0.5D;
@@ -75,7 +74,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    d1 += 0.5D;
 +                }
 +
-+                this.world.a((EntityHuman) null, d1, (double) yLoc + 0.5D, d0, SoundEffects.X, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
++                this.world.a((EntityHuman) null, d1, (double) this.position.getY() + 0.5D, d0, SoundEffects.X, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
 +            }
 +            // Paper end
 +
@@ -163,7 +162,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            double d1 = (double) this.getPosition().getX() + 0.5D;
 +            double d0 = (double) this.getPosition().getZ() + 0.5D;
 +
-+            this.world.a((EntityHuman) null, d1, (double) this.getPosition().getY() + 0.5D, d0, SoundEffects.aL, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
++            this.world.a((EntityHuman) null, d1, (double) this.getPosition().getY() + 0.5D, d0, SoundEffects.aM, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
 +        }
 +        // Paper end
 +
@@ -178,7 +177,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            double d0 = (double) this.getPosition().getX() + 0.5D;
 +            double d2 = (double) this.getPosition().getZ() + 0.5D;
 +
-+            this.world.a((EntityHuman) null, d0, (double) this.getPosition().getY() + 0.5D, d2, SoundEffects.aK, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
++            this.world.a((EntityHuman) null, d0, (double) this.getPosition().getY() + 0.5D, d2, SoundEffects.aL, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
 +            this.a = 0.0F;
 +        }
 +        // Paper end