Remove a fair chunk of existing patches now applied to CraftBukkit