diff --git a/sql/world/base/aq_war.sql b/sql/world/base/aq_war.sql
index c609de2..199ae46 100644
--- a/sql/world/base/aq_war.sql
+++ b/sql/world/base/aq_war.sql
@@ -91,16 +91,10 @@ INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `positio
 (@PATH, 3, -6610.057617, 924.652832, 0.373520, 3.076638, 0, 0, 0, 100, 0),
 (@PATH, 4, -6669.620117, 922.713989, -0.686892, 3.683748, 0, 0, 0, 100, 0),
 (@PATH, 5, -6704.018555, 899.425293, -1.393676, 4.236665, 0, 0, 0, 100, 0),
-(@PATH, 6, -4953.628418, -1206.568237, 501.659943, 5.093306, 0, 0, 0, 100, 0),
-(@PATH, 7, -4944.017578, -1226.812378, 501.659241, 4.541171, 0, 0, 0, 100, 0),
-(@PATH, 8, -4951.852051, -1236.240234, 501.664520, 3.806038, 0, 0, 0, 100, 0),
-(@PATH, 9, -4944.017578, -1226.812378, 501.659241, 4.541171, 0, 0, 0, 100, 0),
-(@PATH, 10, -4953.628418, -1206.568237, 501.659943, 5.093306, 0, 0, 0, 100, 0),
-(@PATH, 11, -6704.018555, 899.425293, -1.393676, 4.236665, 0, 0, 0, 100, 0),
-(@PATH, 12, -6669.620117, 922.713989, -0.686892, 3.683748, 0, 0, 0, 100, 0),
-(@PATH, 13, -6610.057617, 924.652832, 0.373520, 3.076638, 0, 0, 0, 100, 0),
-(@PATH, 14, -6540.536133, 985.638306, 0.376532, 3.593430, 0, 0, 0, 100, 0),
-(@PATH, 15, -6497.195801, 1021.785889, 0.376532, 4.003111, 0, 0, 0, 100, 0);
+(@PATH, 6, -6669.620117, 922.713989, -0.686892, 3.683748, 0, 0, 0, 100, 0),
+(@PATH, 7, -6610.057617, 924.652832, 0.373520, 3.076638, 0, 0, 0, 100, 0),
+(@PATH, 8, -6540.536133, 985.638306, 0.376532, 3.593430, 0, 0, 0, 100, 0),
+(@PATH, 9, -6497.195801, 1021.785889, 0.376532, 4.003111, 0, 0, 0, 100, 0);
 
 DELETE FROM `creature_template_addon` WHERE `entry` IN (@NPC);
 INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES
@@ -113,9 +107,9 @@ DELETE FROM `waypoint_data` WHERE `id` = @PATH;
 INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
 (@PATH, 1, -7870.958496, 687.510498, -27.781849, 0.293172, 0, 0, 0, 100, 0),
 (@PATH, 2, -7791.520996, 727.871521, -37.473316, 0.432190, 0, 0, 0, 100, 0),
-(@PATH, 3,  -7720.165039, 719.385498, -41.306274, 5.582830, 0, 0, 0, 100, 0),
+(@PATH, 3, -7720.165039, 719.385498, -41.306274, 5.582830, 0, 0, 0, 100, 0),
 (@PATH, 4, -7637.914551, 609.112854, -51.588173, 5.230968, 0, 0, 0, 100, 0),
-(@PATH, 5,  -7720.165039, 719.385498, -41.306274, 5.582830, 0, 0, 0, 100, 0),
+(@PATH, 5, -7720.165039, 719.385498, -41.306274, 5.582830, 0, 0, 0, 100, 0),
 (@PATH, 6, -7791.520996, 727.871521, -37.473316, 0.432190, 0, 0, 0, 100, 0),
 (@PATH, 7, -7870.958496, 687.510498, -27.781849, 0.293172, 0, 0, 0, 100, 0);
 
@@ -133,12 +127,10 @@ INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `positio
 (@PATH, 3, -7352.450684, 1710.901733, -38.267399, 5.460305, 0, 0, 0, 100, 0),
 (@PATH, 4, -7329.275391, 1640.641968, -32.322731, 5.153214, 0, 0, 0, 100, 0),
 (@PATH, 5, -7299.695801, 1599.568481, -30.213583, 5.754819, 0, 0, 0, 100, 0),
-(@PATH, 6, -7250.575195, 1534.470459, -10.517513, 5.041683, 0, 0, 0, 100, 0),
-(@PATH, 7, -7299.695801, 1599.568481, -30.213583, 5.754819, 0, 0, 0, 100, 0),
-(@PATH, 8, -7329.275391, 1640.641968, -32.322731, 5.153214, 0, 0, 0, 100, 0),
-(@PATH, 9, -7352.450684, 1710.901733, -38.267399, 5.460305, 0, 0, 0, 100, 0),
-(@PATH, 10, -7409.972656, 1705.264404, -36.461433, 1.437496, 0, 0, 0, 100, 0),
-(@PATH, 11, -7418.407227, 1649.863770, -32.103611, 1.029089, 0, 0, 0, 100, 0);
+(@PATH, 6, -7329.275391, 1640.641968, -32.322731, 5.153214, 0, 0, 0, 100, 0),
+(@PATH, 7, -7352.450684, 1710.901733, -38.267399, 5.460305, 0, 0, 0, 100, 0),
+(@PATH, 8, -7409.972656, 1705.264404, -36.461433, 1.437496, 0, 0, 0, 100, 0),
+(@PATH, 9, -7418.407227, 1649.863770, -32.103611, 1.029089, 0, 0, 0, 100, 0);
 
 DELETE FROM `creature_template_addon` WHERE `entry` IN (@NPC);
 INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES