diff --git a/Bukkit b/Bukkit
index 677e082bc..22d5465ee 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 677e082bc10ca217e21dee06424bb8044730b340
+Subproject commit 22d5465ee9fab9284a70289e043c882a16e2656f
diff --git a/CraftBukkit b/CraftBukkit
index bc14645b6..aae615536 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit bc14645b6f7442af6bb819098a2dcbde582ce923
+Subproject commit aae615536dc048630301297aaed98d84d9aad27e
diff --git a/MinecraftServer/pom.xml b/MinecraftServer/pom.xml
index d4920f604..867973676 100644
--- a/MinecraftServer/pom.xml
+++ b/MinecraftServer/pom.xml
@@ -30,12 +30,6 @@
             <version>1.7.10</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-handler</artifactId>
-            <version>4.0.21.Final</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -52,24 +46,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <filters>
-                        <!-- Exclude old Netty version -->
-                        <filter>
-                            <artifact>org.bukkit:minecraft-server</artifact>
-                            <excludes>
-                                <exclude>net/minecraft/util/io/netty/**</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
-                    <relocations>
-                        <!-- Relocate new version to the correct place -->
-                        <relocation>
-                            <pattern>io.netty</pattern>
-                            <shadedPattern>net.minecraft.util.io.netty</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
             </plugin>
         </plugins>
     </build>