diff --git a/sql/updates/world/2016_07_17_00_world.sql b/sql/updates/world/2016_07_17_00_world.sql
new file mode 100644
index 00000000000..a3e9ca62e6f
--- /dev/null
+++ b/sql/updates/world/2016_07_17_00_world.sql
@@ -0,0 +1,15 @@
+--
+SET @NPC_OVERLORD_RUNTHAK:= 31431;
+SET @NPC_THRALL:= 31412;
+SET @NPC_SYLVANAS:= 31419;
+
+SET @OG_TELEPORTSPELL:= 59064;
+SET @UCTELEPORTSPELL:= 59439;
+
+UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = @NPC_OVERLORD_RUNTHAK;
+UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = @NPC_THRALL;
+UPDATE `creature_template` SET `AIName` = '' WHERE `entry` = @NPC_SYLVANAS;
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 5279;
+
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (@OG_TELEPORTSPELL, @UCTELEPORTSPELL);