diff --git a/CraftBukkit-Patches/0003-mc-dev-imports.patch b/CraftBukkit-Patches/0003-mc-dev-imports.patch
index cd89bb61f6..dccc23cbe5 100644
--- a/CraftBukkit-Patches/0003-mc-dev-imports.patch
+++ b/CraftBukkit-Patches/0003-mc-dev-imports.patch
@@ -968,81 +968,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return this.data;
 +    }
 +}
-diff --git a/src/main/java/net/minecraft/server/NavigationListener.java b/src/main/java/net/minecraft/server/NavigationListener.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
---- /dev/null
-+++ b/src/main/java/net/minecraft/server/NavigationListener.java
-@@ -0,0 +0,0 @@
-+package net.minecraft.server;
-+
-+import java.util.WeakHashMap;
-+
-+public class NavigationListener implements IWorldAccess {
-+
-+    private static final Object a = new Object();
-+    private final WeakHashMap<NavigationAbstract, Object> b = new WeakHashMap();
-+
-+    public NavigationListener() {}
-+
-+    public void a(NavigationAbstract navigationabstract) {
-+        this.b.put(navigationabstract, NavigationListener.a);
-+    }
-+
-+    public void a(World world, BlockPosition blockposition, IBlockData iblockdata, IBlockData iblockdata1, int i) {
-+        if (this.a(world, blockposition, iblockdata, iblockdata1)) {
-+            NavigationAbstract[] anavigationabstract = (NavigationAbstract[]) this.b.keySet().toArray(new NavigationAbstract[0]);
-+            NavigationAbstract[] anavigationabstract1 = anavigationabstract;
-+            int j = anavigationabstract.length;
-+
-+            for (int k = 0; k < j; ++k) {
-+                NavigationAbstract navigationabstract = anavigationabstract1[k];
-+
-+                if (navigationabstract != null && !navigationabstract.i()) {
-+                    PathEntity pathentity = navigationabstract.k();
-+
-+                    if (pathentity != null && !pathentity.b() && pathentity.d() != 0) {
-+                        PathPoint pathpoint = navigationabstract.c.c();
-+                        double d0 = blockposition.distanceSquared(((double) pathpoint.a + navigationabstract.a.locX) / 2.0D, ((double) pathpoint.b + navigationabstract.a.locY) / 2.0D, ((double) pathpoint.c + navigationabstract.a.locZ) / 2.0D);
-+                        int l = (pathentity.d() - pathentity.e()) * (pathentity.d() - pathentity.e());
-+
-+                        if (d0 < (double) l) {
-+                            navigationabstract.j();
-+                        }
-+                    }
-+                }
-+            }
-+
-+        }
-+    }
-+
-+    protected boolean a(World world, BlockPosition blockposition, IBlockData iblockdata, IBlockData iblockdata1) {
-+        AxisAlignedBB axisalignedbb = iblockdata.d(world, blockposition);
-+        AxisAlignedBB axisalignedbb1 = iblockdata1.d(world, blockposition);
-+
-+        return axisalignedbb != axisalignedbb1 && (axisalignedbb == null || !axisalignedbb.equals(axisalignedbb1));
-+    }
-+
-+    public void a(BlockPosition blockposition) {}
-+
-+    public void a(int i, int j, int k, int l, int i1, int j1) {}
-+
-+    public void a(EntityHuman entityhuman, SoundEffect soundeffect, SoundCategory soundcategory, double d0, double d1, double d2, float f, float f1) {}
-+
-+    public void a(int i, boolean flag, double d0, double d1, double d2, double d3, double d4, double d5, int... aint) {}
-+
-+    public void a(Entity entity) {}
-+
-+    public void b(Entity entity) {}
-+
-+    public void a(SoundEffect soundeffect, BlockPosition blockposition) {}
-+
-+    public void a(int i, BlockPosition blockposition, int j) {}
-+
-+    public void a(EntityHuman entityhuman, int i, BlockPosition blockposition, int j) {}
-+
-+    public void b(int i, BlockPosition blockposition, int j) {}
-+}
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
diff --git a/CraftBukkit-Patches/0150-Don-t-copy-NavigationListener-Map-on-Iteration.patch b/CraftBukkit-Patches/0150-Don-t-copy-NavigationListener-Map-on-Iteration.patch
deleted file mode 100644
index e1be243f48..0000000000
--- a/CraftBukkit-Patches/0150-Don-t-copy-NavigationListener-Map-on-Iteration.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: md_5 <git@md-5.net>
-Date: Fri, 18 Mar 2016 14:41:20 +1100
-Subject: [PATCH] Don't copy NavigationListener Map on Iteration.
-
-
-diff --git a/src/main/java/net/minecraft/server/NavigationListener.java b/src/main/java/net/minecraft/server/NavigationListener.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/NavigationListener.java
-+++ b/src/main/java/net/minecraft/server/NavigationListener.java
-@@ -0,0 +0,0 @@ public class NavigationListener implements IWorldAccess {
- 
-     public void a(World world, BlockPosition blockposition, IBlockData iblockdata, IBlockData iblockdata1, int i) {
-         if (this.a(world, blockposition, iblockdata, iblockdata1)) {
--            NavigationAbstract[] anavigationabstract = (NavigationAbstract[]) this.b.keySet().toArray(new NavigationAbstract[0]);
--            NavigationAbstract[] anavigationabstract1 = anavigationabstract;
--            int j = anavigationabstract.length;
--
--            for (int k = 0; k < j; ++k) {
--                NavigationAbstract navigationabstract = anavigationabstract1[k];
-+            // Spigot start
-+            // NavigationAbstract[] anavigationabstract = (NavigationAbstract[]) this.b.keySet().toArray(new NavigationAbstract[0]);
-+            // NavigationAbstract[] anavigationabstract1 = anavigationabstract;
-+            // int j = anavigationabstract.length;
-+
-+            for (NavigationAbstract navigationabstract : this.b.keySet()) {
-+                // NavigationAbstract navigationabstract = anavigationabstract1[k];
-+                // Spigot end
- 
-                 if (navigationabstract != null && !navigationabstract.i()) {
-                     PathEntity pathentity = navigationabstract.k();
---
\ No newline at end of file