diff --git a/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql b/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql
deleted file mode 100644
index b72239540dd..00000000000
--- a/sql/updates/world/3.3.5/2018_08_26_02_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- 
-UPDATE `event_scripts` SET `datalong`=5448 WHERE `id`=15452;
diff --git a/sql/updates/world/3.3.5/2018_08_26_06_world_335.sql b/sql/updates/world/3.3.5/2018_08_26_06_world_335.sql
deleted file mode 100644
index 963ad95ea61..00000000000
--- a/sql/updates/world/3.3.5/2018_08_26_06_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- quest 787 "The New Horde" completion text
-UPDATE `quest_offer_reward` SET `RewardText`= "Another one of Eitrigg's recruits, hm?$B$BA sorry state of affairs we find ourselves in if this is the best the Horde can produce.  No matter.  By the time we think you're ready to leave the Valley, you'll be a proud warrior of the Horde." WHERE `ID`=787;
diff --git a/sql/updates/world/4.3.4/2018_08_26_00_world_from_335_was_2018_08_26_02_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_00_world_from_335_was_2018_08_26_02_world_335.sql
new file mode 100644
index 00000000000..d6ed1ee2cac
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_08_26_00_world_from_335_was_2018_08_26_02_world_335.sql
@@ -0,0 +1,2 @@
+-- 
+-- UPDATE `event_scripts` SET `datalong`=5448 WHERE `id`=15452;
diff --git a/sql/updates/world/3.3.5/2018_08_26_03_world.sql b/sql/updates/world/4.3.4/2018_08_26_01_world_from_335_was_2018_08_26_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2018_08_26_03_world.sql
rename to sql/updates/world/4.3.4/2018_08_26_01_world_from_335_was_2018_08_26_03_world.sql
diff --git a/sql/updates/world/3.3.5/2018_08_26_04_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_02_world_from_335_was_2018_08_26_04_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_26_04_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_26_02_world_from_335_was_2018_08_26_04_world_335.sql
index cb962127d11..c37d5088909 100644
--- a/sql/updates/world/3.3.5/2018_08_26_04_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_26_02_world_from_335_was_2018_08_26_04_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- 
 -- Theramore Practicing Guard
 UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4951;
@@ -6,3 +7,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (4951,0,0,0,25,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,19,4952,0,0,0,0,0,0,"Theramore Practicing Guard - On Reset - Start Attacking");
 -- Theramore Combat Dummy
 UPDATE `creature_template` SET `ScriptName`="npc_training_dummy" WHERE `entry`=4952;
+*/
diff --git a/sql/updates/world/3.3.5/2018_08_26_05_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_03_world_from_335_was_2018_08_26_05_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_26_05_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_26_03_world_from_335_was_2018_08_26_05_world_335.sql
index 59a29c1485e..0f087f6d61b 100644
--- a/sql/updates/world/3.3.5/2018_08_26_05_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_26_03_world_from_335_was_2018_08_26_05_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- 
 -- Quest "Deadmire"
 DELETE FROM `quest_details` WHERE `ID`=1205;
@@ -290,3 +291,4 @@ INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `Emot
 (7070,1,1,0,0,0,0,0,0,0);
 UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=7070;
 UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=7070;
+*/
diff --git a/sql/updates/world/4.3.4/2018_08_26_04_world_from_335_was_2018_08_26_06_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_04_world_from_335_was_2018_08_26_06_world_335.sql
new file mode 100644
index 00000000000..c45ae568d11
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_08_26_04_world_from_335_was_2018_08_26_06_world_335.sql
@@ -0,0 +1,2 @@
+-- quest 787 "The New Horde" completion text
+-- UPDATE `quest_offer_reward` SET `RewardText`= "Another one of Eitrigg's recruits, hm?$B$BA sorry state of affairs we find ourselves in if this is the best the Horde can produce.  No matter.  By the time we think you're ready to leave the Valley, you'll be a proud warrior of the Horde." WHERE `ID`=787;
diff --git a/sql/updates/world/3.3.5/2018_08_26_07_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_05_world_from_335_was_2018_08_26_07_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_26_07_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_26_05_world_from_335_was_2018_08_26_07_world_335.sql
index bf22043e17b..b2ebce6cca0 100644
--- a/sql/updates/world/3.3.5/2018_08_26_07_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_26_05_world_from_335_was_2018_08_26_07_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Duriel Moonfire
 DELETE FROM `smart_scripts` WHERE `entryorguid`=12860 AND `source_type`=0 AND `id`=2;
 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
@@ -68,3 +69,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (-32378,0,6,0,38,0,100,512,2,2,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Data Set 2 2 - Despawn in 1000 ms"),
 (-32378,0,7,0,1,0,100,512,1000,1000,1000,1000,101,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - Out of Combat - Set Home Position"),
 (-32378,0,8,0,11,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Splintertree Raider - On Respawn - Set Flag Standstate 'Kneel'");
+*/
diff --git a/sql/updates/world/3.3.5/2018_08_26_08_world_335.sql b/sql/updates/world/4.3.4/2018_08_26_06_world_from_335_was_2018_08_26_08_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_08_26_08_world_335.sql
rename to sql/updates/world/4.3.4/2018_08_26_06_world_from_335_was_2018_08_26_08_world_335.sql
index 584254d9de3..8516167d659 100644
--- a/sql/updates/world/3.3.5/2018_08_26_08_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_08_26_06_world_from_335_was_2018_08_26_08_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Quest "Missing Crystals"
 DELETE FROM `quest_details` WHERE `ID`=9435;
 INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
@@ -179,3 +180,4 @@ UPDATE `quest_offer_reward` SET `Emote1`=21 WHERE `ID`=7102;
 -- Quest "Capture a Mine"
 UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=7122;
 UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=7122;
+*/
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 9f06998661c..b871299271d 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -175,7 +175,7 @@ struct PositionFullTerrainStatus
         uint32 const mogpFlags;
     };
 
-    PositionFullTerrainStatus() : areaId(0), floorZ(0.0f), outdoors(true) { }
+    // PositionFullTerrainStatus() : areaId(0), floorZ(0.0f), outdoors(true) { }
     uint32 areaId;
     float floorZ;
     ZLiquidStatus liquidStatus;