diff --git a/sql/updates/world/3.3.5/2018_01_21_02_world_335.sql b/sql/updates/world/3.3.5/2018_01_21_02_world_335.sql
deleted file mode 100644
index 2493bb5222..0000000000
--- a/sql/updates/world/3.3.5/2018_01_21_02_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Argent Guard Thaelrid
-UPDATE `creature_template` SET `faction`=794 WHERE `entry`=4787;
diff --git a/sql/updates/world/3.3.5/2018_01_23_00_world_335.sql b/sql/updates/world/3.3.5/2018_01_23_00_world_335.sql
deleted file mode 100644
index 6c643caf72..0000000000
--- a/sql/updates/world/3.3.5/2018_01_23_00_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `spell_bonus_data` SET `direct_bonus`=0 WHERE `entry`=33763;
-UPDATE `spell_bonus_data` SET `direct_bonus`=0.51623296 WHERE `entry`=33778;
diff --git a/sql/updates/world/3.3.5/2018_01_25_04_world_335.sql b/sql/updates/world/3.3.5/2018_01_25_04_world_335.sql
deleted file mode 100644
index 3b228de52a..0000000000
--- a/sql/updates/world/3.3.5/2018_01_25_04_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Call to Arms! --> Fix Gossip Text
-UPDATE `gossip_menu` SET `TextID`=7274 WHERE `MenuID`=6121;
diff --git a/sql/updates/world/3.3.5/2018_01_25_08_world_335.sql b/sql/updates/world/3.3.5/2018_01_25_08_world_335.sql
deleted file mode 100644
index bdf979dfa8..0000000000
--- a/sql/updates/world/3.3.5/2018_01_25_08_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Kalaran Windblade --> Fix condition
-UPDATE `conditions` SET `NegativeCondition`=1 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1323 AND `ConditionTypeOrReference`=2;
diff --git a/sql/updates/world/4.3.4/2018_01_27_01_world_from_335_was_2018_01_21_02_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_01_world_from_335_was_2018_01_21_02_world_335.sql
new file mode 100644
index 0000000000..3452a04b70
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_01_27_01_world_from_335_was_2018_01_21_02_world_335.sql
@@ -0,0 +1,2 @@
+-- Argent Guard Thaelrid
+-- UPDATE `creature_template` SET `faction`=794 WHERE `entry`=4787;
diff --git a/sql/updates/world/4.3.4/2018_01_27_02_world_from_335_was_2018_01_23_00_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_02_world_from_335_was_2018_01_23_00_world_335.sql
new file mode 100644
index 0000000000..8ee9b4885b
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_01_27_02_world_from_335_was_2018_01_23_00_world_335.sql
@@ -0,0 +1,2 @@
+-- UPDATE `spell_bonus_data` SET `direct_bonus`=0 WHERE `entry`=33763;
+-- UPDATE `spell_bonus_data` SET `direct_bonus`=0.51623296 WHERE `entry`=33778;
diff --git a/sql/updates/world/3.3.5/2018_01_24_00_world.sql b/sql/updates/world/4.3.4/2018_01_27_03_world_from_335_was_2018_01_24_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2018_01_24_00_world.sql
rename to sql/updates/world/4.3.4/2018_01_27_03_world_from_335_was_2018_01_24_00_world.sql
diff --git a/sql/updates/world/3.3.5/2018_01_24_03_world.sql b/sql/updates/world/4.3.4/2018_01_27_04_world_from_335_was_2018_01_24_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2018_01_24_03_world.sql
rename to sql/updates/world/4.3.4/2018_01_27_04_world_from_335_was_2018_01_24_03_world.sql
diff --git a/sql/updates/world/3.3.5/2018_01_25_02_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_05_world_from_335_was_2018_01_25_02_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_01_25_02_world_335.sql
rename to sql/updates/world/4.3.4/2018_01_27_05_world_from_335_was_2018_01_25_02_world_335.sql
index e52cd25de0..1dd809df38 100644
--- a/sql/updates/world/3.3.5/2018_01_25_02_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_01_27_05_world_from_335_was_2018_01_25_02_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Gavis Greyshield
 DELETE FROM `smart_scripts` WHERE `entryorguid`= 23941 AND `source_type`= 0;
 DELETE FROM `smart_scripts` WHERE `entryorguid`= 2394100 AND `source_type`= 9;
@@ -10,3 +11,4 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 (2394100,9,0,0, 0,0,100,  0, 1000, 1000,0,0,  1,      0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gavis Greyshield - On Script - Say Line 0"),
 (2394100,9,1,0, 0,0,100,  0, 4000, 4000,0,0,  1,      1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gavis Greyshield - On Script - Say Line 1"),
 (2394100,9,2,0, 0,0,100,  0,10000,10000,0,0, 41,      0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gavis Greyshield - On Script - Despawn");
+*/
diff --git a/sql/updates/world/3.3.5/2018_01_25_03_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_06_world_from_335_was_2018_01_25_03_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_01_25_03_world_335.sql
rename to sql/updates/world/4.3.4/2018_01_27_06_world_from_335_was_2018_01_25_03_world_335.sql
index 8a5dac2a53..2c11a148f5 100644
--- a/sql/updates/world/3.3.5/2018_01_25_03_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_01_27_06_world_from_335_was_2018_01_25_03_world_335.sql
@@ -1,5 +1,7 @@
+/*
 -- Master Smith Burninate --> Fix gossip conditions
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=5962;
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
 (14,5962,7121,0,0,8,0,7722,0,0,0,0,0,"","Show gossip text 7121 if player has quest 'What the Flux?' rewarded"),
 (14,5962,7121,0,0,5,0,59,128,0,0,0,0,"","Show gossip text 7121 if player is exalted with Thorium Brotherhood");
+*/
diff --git a/sql/updates/world/4.3.4/2018_01_27_07_world_from_335_was_2018_01_25_04_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_07_world_from_335_was_2018_01_25_04_world_335.sql
new file mode 100644
index 0000000000..fbc42a249f
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_01_27_07_world_from_335_was_2018_01_25_04_world_335.sql
@@ -0,0 +1,2 @@
+-- Call to Arms! --> Fix Gossip Text
+-- UPDATE `gossip_menu` SET `TextID`=7274 WHERE `MenuID`=6121;
diff --git a/sql/updates/world/3.3.5/2018_01_25_05_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_08_world_from_335_was_2018_01_25_05_world_335.sql
similarity index 97%
rename from sql/updates/world/3.3.5/2018_01_25_05_world_335.sql
rename to sql/updates/world/4.3.4/2018_01_27_08_world_from_335_was_2018_01_25_05_world_335.sql
index dbdcd1a6e5..65efd6f680 100644
--- a/sql/updates/world/3.3.5/2018_01_25_05_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_01_27_08_world_from_335_was_2018_01_25_05_world_335.sql
@@ -1,6 +1,8 @@
+/*
 -- Primal Torntusk --> Add Gossip Text
 UPDATE `creature_template` SET `gossip_menu_id`=6084 WHERE `entry`=14736;
 
 DELETE FROM `gossip_menu` WHERE `MenuID`=6084;
 INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
 (6084,7238,0);
+*/
diff --git a/sql/updates/world/3.3.5/2018_01_25_06_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_09_world_from_335_was_2018_01_25_06_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_01_25_06_world_335.sql
rename to sql/updates/world/4.3.4/2018_01_27_09_world_from_335_was_2018_01_25_06_world_335.sql
index 714f7f4455..bc0d4505cd 100644
--- a/sql/updates/world/3.3.5/2018_01_25_06_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_01_27_09_world_from_335_was_2018_01_25_06_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Fallen Hero of the Horde --> Fix gossip texts
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=840;
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
@@ -18,3 +19,4 @@ DELETE FROM `smart_scripts` WHERE `entryorguid`=7572 AND `source_type`=0 AND `id
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
 (7572,0,0,2,62,0,100,512,842,0,0,0,26,2784,0,0,0,0,0,7,0,0,0,0,0,0,0,"Fallen Hero of the Horde - On Gossip Option 0 Selected - Quest Credit 'Fall From Grace'"),
 (7572,0,1,2,62,0,100,512,881,0,0,0,26,2801,0,0,0,0,0,7,0,0,0,0,0,0,0,"Fallen Hero of the Horde - On Gossip Option 0 Selected - Quest Credit 'A Tale of Sorrow'");
+*/
diff --git a/sql/updates/world/3.3.5/2018_01_25_07_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_10_world_from_335_was_2018_01_25_07_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_01_25_07_world_335.sql
rename to sql/updates/world/4.3.4/2018_01_27_10_world_from_335_was_2018_01_25_07_world_335.sql
index 89c3ab1618..47fa298787 100644
--- a/sql/updates/world/3.3.5/2018_01_25_07_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_01_27_10_world_from_335_was_2018_01_25_07_world_335.sql
@@ -1,3 +1,4 @@
+/*
 UPDATE `creature_template` SET `gossip_menu_id`=6522, `npcflag`=4227, `type_flags`=134217728 WHERE `entry`=15127; -- Samuel Hawke
 UPDATE `creature_template` SET `gossip_menu_id`=6521, `npcflag`=4227, `type_flags`=134217728 WHERE `entry`=15126; -- Rutherford Twing
 UPDATE `creature_template` SET `gossip_menu_id`=6142, `npcflag`=4227, `type_flags`=134217728 WHERE `entry`=14753; -- Illiyana Moonblaze
@@ -16,3 +17,4 @@ INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionTex
 (6521,0,1,"What goods have I earned the right to purchase from the Defilers?",10623,3,128,0,0,0,0,"",0,0), -- Rutherford Twing
 (6142,0,1,"What goods have I earned the right to purchase for use in Warsong Gulch?",10021,3,128,0,0,0,0,"",0,0), -- Illiyana Moonblaze
 (6141,0,1,"What goods have I earned the right to purchase for use in Warsong Gulch?",10019,3,128,0,0,0,0,"",0,0); -- Kelm Hargunth
+*/
diff --git a/sql/updates/world/4.3.4/2018_01_27_11_world_from_335_was_2018_01_25_08_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_11_world_from_335_was_2018_01_25_08_world_335.sql
new file mode 100644
index 0000000000..9d1772c50a
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_01_27_11_world_from_335_was_2018_01_25_08_world_335.sql
@@ -0,0 +1,2 @@
+-- Kalaran Windblade --> Fix condition
+-- UPDATE `conditions` SET `NegativeCondition`=1 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1323 AND `ConditionTypeOrReference`=2;
diff --git a/sql/updates/world/3.3.5/2018_01_25_09_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_12_world_from_335_was_2018_01_25_09_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_01_25_09_world_335.sql
rename to sql/updates/world/4.3.4/2018_01_27_12_world_from_335_was_2018_01_25_09_world_335.sql
index 35d4cba031..451585d774 100644
--- a/sql/updates/world/3.3.5/2018_01_25_09_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_01_27_12_world_from_335_was_2018_01_25_09_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Quest "The Torch of Retribution"
 DELETE FROM `smart_scripts` WHERE `entryorguid`=847900 AND `source_type`=9;
 INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
@@ -26,3 +27,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan
 (8479,1,0,"Be patient, $n. The torch is almost complete.",12,0,100,1,0,0,4448,0,"Kalaran Windblade"),
 (8479,2,0,"%s falls to one knee. He looks exhausted.",16,0,100,0,0,0,4449,0,"Kalaran Windblade"),
 (8479,3,0,"It is done...",12,0,100,0,0,0,4450,0,"Kalaran Windblade");
+*/
diff --git a/sql/updates/world/3.3.5/2018_01_25_10_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_13_world_from_335_was_2018_01_25_10_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_01_25_10_world_335.sql
rename to sql/updates/world/4.3.4/2018_01_27_13_world_from_335_was_2018_01_25_10_world_335.sql
index 0709ffc34e..7bf7f8618c 100644
--- a/sql/updates/world/3.3.5/2018_01_25_10_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_01_27_13_world_from_335_was_2018_01_25_10_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Quest "The Key to Freedom"
 -- Wooden Outhouse
 DELETE FROM `smart_scripts` WHERE `entryorguid`=173265 AND `source_type`=1 AND `id` IN (1,2,3);
@@ -20,3 +21,4 @@ DELETE FROM `creature_text` WHERE `CreatureID`=9876;
 INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
 (9876,0,0,"Ach! Thank you so much, $n! I'm free! Finally!",12,0,100,4,0,0,5407,0,"Locheed"),
 (9876,1,0,"You take care of yourself! I'm gettin' out o' here.",12,0,100,5,0,0,5408,0,"Locheed");
+*/
diff --git a/sql/updates/world/3.3.5/2018_01_25_11_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_14_world_from_335_was_2018_01_25_11_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_01_25_11_world_335.sql
rename to sql/updates/world/4.3.4/2018_01_27_14_world_from_335_was_2018_01_25_11_world_335.sql
index 4bc2045cfe..f1b5792ab4 100644
--- a/sql/updates/world/3.3.5/2018_01_25_11_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_01_27_14_world_from_335_was_2018_01_25_11_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Quest "Set Them Ablaze!"
 -- Squire Maltrake
 UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=8509;
@@ -45,3 +46,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan
 (8480,8,0,"The legion of Blackrock comes, dwarflings! We shall scorch the earth and set fire to the heavens. None shall survive...",14,0,100,0,0,0,4465,0,"Kalaran the Deceiver"),
 (8509,0,0,"What will we do with them, master? They are of no use to us anymore.",12,0,100,6,0,0,4459,0,"Squire Maltrake"),
 (8509,1,0,"Right away, master!",12,0,100,2,0,0,4468,0,"Squire Maltrake");
+*/
diff --git a/sql/updates/world/3.3.5/2018_01_25_12_world_335.sql b/sql/updates/world/4.3.4/2018_01_27_15_world_from_335_was_2018_01_25_12_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_01_25_12_world_335.sql
rename to sql/updates/world/4.3.4/2018_01_27_15_world_from_335_was_2018_01_25_12_world_335.sql
index 550e002f4a..209000b370 100644
--- a/sql/updates/world/3.3.5/2018_01_25_12_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_01_27_15_world_from_335_was_2018_01_25_12_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Glassweb Spider
 UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5856;
 DELETE FROM `smart_scripts` WHERE `entryorguid`=5856 AND `source_type`=0;
@@ -138,3 +139,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 
 -- Fix bytes2 for some creatures
 UPDATE `creature_addon` SET `bytes2`=2 WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` IN (8283,8566));
+*/
diff --git a/sql/updates/world/3.3.5/2018_01_26_00_world.sql b/sql/updates/world/4.3.4/2018_01_27_16_world_from_335_was_2018_01_26_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2018_01_26_00_world.sql
rename to sql/updates/world/4.3.4/2018_01_27_16_world_from_335_was_2018_01_26_00_world.sql