diff --git a/data/sql/world/base/vanilla_creatures.sql b/data/sql/world/base/vanilla_creatures.sql
index c87f215..8614bd9 100644
--- a/data/sql/world/base/vanilla_creatures.sql
+++ b/data/sql/world/base/vanilla_creatures.sql
@@ -13,6 +13,9 @@ UPDATE `creature_template` SET `detection_range` = 18.0, `HealthModifier` = 1.02
 /*  Furbolg  */
 UPDATE `creature_template` SET `speed_walk` = 1.0, `detection_range` = 18.0 WHERE `entry` = 31;
 
+/* Defias Thug */
+UPDATE `creature_template` SET `faction` = 17 WHERE `entry` = 38;
+
 /*  Skeletal Warrior  */
 UPDATE `creature_template` SET `speed_walk` = 0.888888, `DamageModifier` = 0.95 WHERE `entry` = 48;
 
@@ -98,7 +101,7 @@ UPDATE `creature_template` SET `DamageModifier` = 0.75 WHERE `entry` = 100;
 UPDATE `creature_template` SET `speed_walk` = 1.0, `detection_range` = 18.0 WHERE `entry` = 102;
 
 /*  Garrick Padfoot  */
-UPDATE `creature_template` SET `speed_run` = 0.857143, `ManaModifier` = 1.0, `mingold` = 3, `maxgold` = 9 WHERE `entry` = 103;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `ManaModifier` = 1.0, `mingold` = 3, `maxgold` = 9, `faction` = 17 WHERE `entry` = 103;
 
 /*  Tall Strider  */
 UPDATE `creature_template` SET `speed_walk` = 1.0, `detection_range` = 18.0 WHERE `entry` = 105;
@@ -1052,7 +1055,7 @@ UPDATE `creature_template` SET `minlevel` = 25, `maxlevel` = 26, `speed_walk` =
 UPDATE `creature_template` SET `dmgschool` = 5, `DamageModifier` = 1.05 WHERE `entry` = 703;
 
 /*  Frostmane Troll Whelp  */
-UPDATE `creature_template` SET `speed_run` = 0.857143, `RangeAttackTime` = 2167 WHERE `entry` = 706;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `RangeAttackTime` = 2167, `faction` = 107 WHERE `entry` = 706;
 
 /*  Rockjaw Trogg  */
 UPDATE `creature_template` SET `speed_run` = 0.857143, `maxgold` = 4 WHERE `entry` = 707;
@@ -1244,7 +1247,7 @@ UPDATE `creature_template` SET `DamageModifier` = 1.3 WHERE `entry` = 806;
 UPDATE `creature_template` SET `DamageModifier` = 1.3 WHERE `entry` = 807;
 
 /*  Grik'nir the Cold  */
-UPDATE `creature_template` SET `speed_run` = 0.857143, `RangeAttackTime` = 2156, `mingold` = 3, `maxgold` = 9 WHERE `entry` = 808;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `RangeAttackTime` = 2156, `mingold` = 3, `maxgold` = 9, `faction` = 37 WHERE `entry` = 808;
 
 /*  [UNUSED] Smith Theo  */
 UPDATE `creature_template` SET `detection_range` = 18.0 WHERE `entry` = 809;
@@ -1523,7 +1526,7 @@ UPDATE `creature_template` SET `DamageModifier` = 1.2, `RangeAttackTime` = 2156
 UPDATE `creature_template` SET `DamageModifier` = 1.2 WHERE `entry` = 945;
 
 /*  Frostmane Novice  */
-UPDATE `creature_template` SET `speed_run` = 0.857143, `maxgold` = 7 WHERE `entry` = 946;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `maxgold` = 7, `faction` = 107 WHERE `entry` = 946;
 
 /*  Rohh the Silent  */
 UPDATE `creature_template` SET `DamageModifier` = 0.975 WHERE `entry` = 947;
@@ -2540,10 +2543,13 @@ UPDATE `creature_template` SET `speed_run` = 0.857143, `DamageModifier` = 0.65,
 UPDATE `creature_template` SET `speed_walk` = 1.0, `speed_run` = 0.857143, `detection_range` = 10.0, `DamageModifier` = 0.9, `maxgold` = 4 WHERE `entry` = 1502;
 
 /*  Night Web Spider  */
-UPDATE `creature_template` SET `speed_run` = 0.857143 WHERE `entry` = 1505;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `faction` = 22 WHERE `entry` = 1505;
+
+/* Scarlet Convert */
+UPDATE `creature_template` SET `faction` = 67 WHERE `entry` = 1506;
 
 /*  Scarlet Initiate  */
-UPDATE `creature_template` SET `speed_run` = 0.857143, `maxgold` = 7 WHERE `entry` = 1507;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `maxgold` = 7, `faction` = 67 WHERE `entry` = 1507;
 
 /*  Enraged Silverback Gorilla  */
 UPDATE `creature_template` SET `maxlevel` = 42, `RangeAttackTime` = 1466 WHERE `entry` = 1511;
@@ -2891,7 +2897,7 @@ UPDATE `creature_template` SET `DamageModifier` = 1.5 WHERE `entry` = 1665;
 UPDATE `creature_template` SET `minlevel` = 27, `maxlevel` = 27 WHERE `entry` = 1666;
 
 /*  Meven Korgal  */
-UPDATE `creature_template` SET `speed_run` = 0.857143, `maxgold` = 9 WHERE `entry` = 1667;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `maxgold` = 9, `faction` = 67 WHERE `entry` = 1667;
 
 /*  William MacGregor  */
 UPDATE `creature_template` SET `DamageModifier` = 0.8 WHERE `entry` = 1668;
@@ -2953,6 +2959,9 @@ UPDATE `creature_template` SET `DamageModifier` = 0.8 WHERE `entry` = 1686;
 /*  Cliff Hadin  */
 UPDATE `creature_template` SET `DamageModifier` = 0.8 WHERE `entry` = 1687;
 
+/*  Night Web Matriarch */
+UPDATE `creature_template` SET `faction` = 22 WHERE `entry` = 1688;
+
 /*  Thrawn Boltar  */
 UPDATE `creature_template` SET `DamageModifier` = 0.95 WHERE `entry` = 1690;
 
@@ -3110,7 +3119,7 @@ UPDATE `creature_template` SET `ArmorModifier` = 0.85 WHERE `entry` = 1754;
 UPDATE `creature_template` SET `ArmorModifier` = 0.85 WHERE `entry` = 1755;
 
 /*  Stormwind Royal Guard  */
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `DamageModifier` = 1.0, `mingold` = 103, `maxgold` = 517 WHERE `entry` = 1756;
+UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `DamageModifier` = 1.0, `mingold` = 103, `maxgold` = 517, `rank` = 0 WHERE `entry` = 1756;
 
 /*  Mega Rabbit  */
 UPDATE `creature_template` SET `speed_walk` = 1.0, `detection_range` = 18.0 WHERE `entry` = 1757;
@@ -3523,6 +3532,9 @@ UPDATE `creature_template` SET `mingold` = 3, `maxgold` = 13 WHERE `entry` = 198
 /*  Thistle Boar  */
 UPDATE `creature_template` SET `speed_run` = 0.857143 WHERE `entry` = 1985;
 
+/* Webwood Spider */
+UPDATE `creature_template` SET `faction` = 22 WHERE `entry` = 1986;
+
 /*  Webwood Creeper UNUSED  */
 UPDATE `creature_template` SET `speed_run` = 0.857143, `detection_range` = 18.0 WHERE `entry` = 1987;
 
@@ -3541,6 +3553,9 @@ UPDATE `creature_template` SET `DamageModifier` = 0.85 WHERE `entry` = 1992;
 /*  Greenpaw  */
 UPDATE `creature_template` SET `speed_walk` = 0.666668, `speed_run` = 0.857143, `DamageModifier` = 0.95, `ArmorModifier` = 0.85 WHERE `entry` = 1993;
 
+/* Githyiss the Vile */
+UPDATE `creature_template` SET `faction` = 22 WHERE `entry` = 1994;
+
 /*  Gnarlpine Ursa  */
 UPDATE `creature_template` SET `speed_walk` = 0.666668, `speed_run` = 0.857143 WHERE `entry` = 2006;
 
@@ -5285,10 +5300,13 @@ UPDATE `creature_template` SET `speed_run` = 0.857143, `DamageModifier` = 0.95,
 UPDATE `creature_template` SET `speed_run` = 0.857143, `DamageModifier` = 0.9, `ArmorModifier` = 0.85 WHERE `entry` = 2951;
 
 /*  Bristleback Quilboar  */
-UPDATE `creature_template` SET `speed_run` = 0.857143, `DamageModifier` = 0.9, `ArmorModifier` = 0.9 WHERE `entry` = 2952;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `DamageModifier` = 0.9, `ArmorModifier` = 0.9, `faction` = 111 WHERE `entry` = 2952;
 
 /*  Bristleback Shaman  */
-UPDATE `creature_template` SET `speed_run` = 0.857143, `maxgold` = 7 WHERE `entry` = 2953;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `maxgold` = 7, `faction` = 111 WHERE `entry` = 2953;
+
+/*  Bristleback Battleboar  */
+UPDATE `creature_template` SET `faction` = 111 WHERE `entry` = 2954;
 
 /*  Plainstrider  */
 UPDATE `creature_template` SET `speed_walk` = 0.666668, `speed_run` = 0.857143 WHERE `entry` = 2955;
@@ -5317,6 +5335,9 @@ UPDATE `creature_template` SET `speed_run` = 0.857143, `ArmorModifier` = 0.95 WH
 /*  Windfury Matriarch  */
 UPDATE `creature_template` SET `DamageModifier` = 0.95 WHERE `entry` = 2965;
 
+/* Battleboar */
+UPDATE `creature_template` SET `faction` = 14  WHERE `entry` = 2966;
+
 /*  Galak Centaur  */
 UPDATE `creature_template` SET `speed_walk` = 0.666668, `speed_run` = 0.857143, `DamageModifier` = 0.95, `ArmorModifier` = 1.4 WHERE `entry` = 2967;
 
@@ -5375,10 +5396,10 @@ UPDATE `creature_template` SET `DamageModifier` = 0.7 WHERE `entry` = 2987;
 UPDATE `creature_template` SET `DamageModifier` = 0.75 WHERE `entry` = 2988;
 
 /*  Bael'dun Digger  */
-UPDATE `creature_template` SET `faction` = 122, `speed_run` = 0.857143, `DamageModifier` = 1.7, `ArmorModifier` = 0.9 WHERE `entry` = 2989;
+UPDATE `creature_template` SET `faction` = 122, `speed_run` = 0.857143, `DamageModifier` = 1.7, `ArmorModifier` = 0.9, `faction` = 57 WHERE `entry` = 2989;
 
 /*  Bael'dun Appraiser  */
-UPDATE `creature_template` SET `faction` = 122, `speed_run` = 0.857143, `DamageModifier` = 0.9, `ArmorModifier` = 0.8 WHERE `entry` = 2990;
+UPDATE `creature_template` SET `faction` = 122, `speed_run` = 0.857143, `DamageModifier` = 0.9, `ArmorModifier` = 0.8, `faction` = 57 WHERE `entry` = 2990;
 
 /*  Greatmother Hawkwind  */
 UPDATE `creature_template` SET `DamageModifier` = 0.8 WHERE `entry` = 2991;
@@ -5576,10 +5597,10 @@ UPDATE `creature_template` SET `DamageModifier` = 0.75 WHERE `entry` = 3081;
 UPDATE `creature_template` SET `detection_range` = 18.0 WHERE `entry` = 3082;
 
 /*  Honor Guard  */
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `DamageModifier` = 5.85, `ArmorModifier` = 1.3 WHERE `entry` = 3083;
+UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `DamageModifier` = 5.85, `ArmorModifier` = 1.3, `rank` = 0  WHERE `entry` = 3083;
 
 /*  Bluffwatcher  */
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55, `HealthModifier` = 2.0 WHERE `entry` = 3084;
+UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55, `HealthModifier` = 2.0, `faction` = 105 WHERE `entry` = 3084;
 
 /*  Gloria Femmel  */
 UPDATE `creature_template` SET `DamageModifier` = 0.85 WHERE `entry` = 3085;
@@ -5615,7 +5636,10 @@ UPDATE `creature_template` SET `DamageModifier` = 0.85 WHERE `entry` = 3097;
 UPDATE `creature_template` SET `speed_run` = 0.857143, `DamageModifier` = 1.53847 WHERE `entry` = 3099;
 
 /*  Vile Familiar  */
-UPDATE `creature_template` SET `speed_run` = 0.857143, `maxgold` = 7 WHERE `entry` = 3101;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `maxgold` = 7, `faction` = 14 WHERE `entry` = 3101;
+
+/* Felstalker */
+UPDATE `creature_template` SET `faction` = 14 WHERE `entry` = 3102;
 
 /*  Makrura Clacker  */
 UPDATE `creature_template` SET `speed_run` = 0.857143, `ArmorModifier` = 1.5 WHERE `entry` = 3103;
@@ -5786,7 +5810,7 @@ UPDATE `creature_template` SET `DamageModifier` = 0.95 WHERE `entry` = 3180;
 UPDATE `creature_template` SET `DamageModifier` = 0.85 WHERE `entry` = 3182;
 
 /*  Yarrog Baneshadow  */
-UPDATE `creature_template` SET `DamageModifier` = 0.85, `RangeAttackTime` = 2156, `mingold` = 3, `maxgold` = 9 WHERE `entry` = 3183;
+UPDATE `creature_template` SET `DamageModifier` = 0.85, `RangeAttackTime` = 2156, `mingold` = 3, `maxgold` = 9, `faction` = 16 WHERE `entry` = 3183;
 
 /*  Miao'zan  */
 UPDATE `creature_template` SET `subname` = 'Journeyman Alchemist', `DamageModifier` = 0.9 WHERE `entry` = 3184;
@@ -5888,7 +5912,7 @@ UPDATE `creature_template` SET `DamageModifier` = 0.75 WHERE `entry` = 3223;
 UPDATE `creature_template` SET `DamageModifier` = 0.75 WHERE `entry` = 3224;
 
 /*  "Squealer" Thornmantle  */
-UPDATE `creature_template` SET `speed_run` = 0.857143, `DamageModifier` = 0.85, `ArmorModifier` = 0.85, `mingold` = 3, `maxgold` = 9 WHERE `entry` = 3229;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `DamageModifier` = 0.85, `ArmorModifier` = 0.85, `mingold` = 3, `maxgold` = 9, `faction` = 14 WHERE `entry` = 3229;
 
 /*  Nazgrel  */
 UPDATE `creature_template` SET `DamageModifier` = 2.2, `ArmorModifier` = 1.15 WHERE `entry` = 3230;
@@ -6409,6 +6433,9 @@ UPDATE `creature_template` SET `subname` = 'Reagent Vendor', `ArmorModifier` = 0
 /*  Ratchet Bruiser  */
 UPDATE `creature_template` SET `DamageModifier` = 2.0 WHERE `entry` = 3502;
 
+/* Silithid Protector */
+UPDATE `creature_template` SET `faction` = 16  WHERE `entry` = 3503;
+
 /*  Gil  */
 UPDATE `creature_template` SET `DamageModifier` = 1.3 WHERE `entry` = 3504;
 
@@ -6716,7 +6743,7 @@ UPDATE `creature_template` SET `rank` = 1, `DamageModifier` = 1.7, `HealthModifi
 UPDATE `creature_template` SET `rank` = 1, `DamageModifier` = 1.7, `HealthModifier` = 3.0 WHERE `entry` = 3633;
 
 /*  Deviate Stalker  */
-UPDATE `creature_template` SET `maxlevel` = 17, `rank` = 1, `DamageModifier` = 1.7, `HealthModifier` = 3.0 WHERE `entry` = 3634;
+UPDATE `creature_template` SET `minlevel` = 15, `maxlevel` = 17, `rank` = 1, `DamageModifier` = 1.7, `HealthModifier` = 3.0 WHERE `entry` = 3634;
 
 /*  Devouring Ectoplasm  */
 UPDATE `creature_template` SET `rank` = 1, `DamageModifier` = 1.7, `HealthModifier` = 3.0 WHERE `entry` = 3638;
@@ -7970,7 +7997,7 @@ UPDATE `creature_template` SET `detection_range` = 18.0, `HealthModifier` = 1.15
 UPDATE `creature_template` SET `minlevel` = 38, `maxlevel` = 39 WHERE `entry` = 4379;
 
 /*  Darkmist Widow  */
-UPDATE `creature_template` SET `minlevel` = 40, `maxlevel` = 40 WHERE `entry` = 4380;
+UPDATE `creature_template` SET `minlevel` = 40, `maxlevel` = 40, `rank` = 4 WHERE `entry` = 4380;
 
 /*  Withervine Creeper  */
 UPDATE `creature_template` SET `minlevel` = 35, `maxlevel` = 36, `speed_walk` = 0.666668, `DamageModifier` = 1.05, `ArmorModifier` = 1.05 WHERE `entry` = 4382;
@@ -13267,6 +13294,9 @@ UPDATE `creature_template` SET `speed_walk` = 1.0, `DamageModifier` = 3.2, `Rang
 /*  Witherheart the Stalker  */
 UPDATE `creature_template` SET `DamageModifier` = 1.25, `RangeAttackTime` = 1402 WHERE `entry` = 8218;
 
+/* Muck Frenzy */
+UPDATE `creature_template` SET `minlevel` = 14, `maxlevel` = 15 WHERE `entry` = 8236;
+
 /*  Curator Thorius  */
 UPDATE `creature_template` SET `DamageModifier` = 0.95 WHERE `entry` = 8256;
 
@@ -13616,7 +13646,7 @@ UPDATE `creature_template` SET `detection_range` = 18.0, `unit_class` = 2 WHERE
 UPDATE `creature_template` SET `speed_walk` = 1.0, `detection_range` = 18.0 WHERE `entry` = 8552;
 
 /*  Chief Sharptusk Thornmantle  */
-UPDATE `creature_template` SET `speed_run` = 0.857143, `DamageModifier` = 0.85, `ArmorModifier` = 0.55, `mingold` = 3, `maxgold` = 9 WHERE `entry` = 8554;
+UPDATE `creature_template` SET `speed_run` = 0.857143, `DamageModifier` = 0.85, `ArmorModifier` = 0.55, `mingold` = 3, `maxgold` = 9, `faction` = 14 WHERE `entry` = 8554;
 
 /*  Crypt Stalker  */
 UPDATE `creature_template` SET `detection_range` = 18.0 WHERE `entry` = 8555;
@@ -18705,6 +18735,9 @@ UPDATE `creature_template` SET `speed_walk` = 1.0, `detection_range` = 18.0 WHER
 /*  Makasgar  */
 UPDATE `creature_template` SET `RangeAttackTime` = 2046 WHERE `entry` = 13157;
 
+/* Lieutenant Sanders */
+UPDATE `creature_template` SET `faction` = 67 WHERE `entry` = 13158;
+
 /*  Carrion Swarmer  */
 UPDATE `creature_template` SET `DamageModifier` = 1.0 WHERE `entry` = 13160;
 
@@ -19620,6 +19653,9 @@ UPDATE `creature_template` SET `speed_walk` = 1.0, `detection_range` = 18.0, `un
 /*  Ragepaw  */
 UPDATE `creature_template` SET `RangeAttackTime` = 1338 WHERE `entry` = 14342;
 
+/* Olm the Wise, Cenarion Circle */
+UPDATE `creature_template` SET `faction` = 1254 WHERE `entry` = 14343;
+
 /*  Mongress  */
 UPDATE `creature_template` SET `ArmorModifier` = 0.65 WHERE `entry` = 14344;
 
@@ -21494,7 +21530,7 @@ UPDATE `creature_template` SET `speed_walk` = 1.0, `speed_run` = 0.857143, `Dama
 UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `DamageModifier` = 1.0, `HealthModifier` = 1.0 WHERE `entry` = 15350;
 
 /*  Alliance Brigadier General  */
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `DamageModifier` = 2.4, `ArmorModifier` = 1.4 WHERE `entry` = 15351;
+UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `DamageModifier` = 2.4, `ArmorModifier` = 1.4, `rank` = 0 WHERE `entry` = 15351;
 
 /*  Greater Earth Elemental  */
 UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `speed_walk` = 1.0, `detection_range` = 18.0, `DamageModifier` = 1.0, `unit_class` = 8 WHERE `entry` = 15352;
diff --git a/data/sql/world/base/zone_barrens.sql b/data/sql/world/base/zone_barrens.sql
index 85b780e..9cc5e3d 100644
--- a/data/sql/world/base/zone_barrens.sql
+++ b/data/sql/world/base/zone_barrens.sql
@@ -344,42 +344,6 @@ UPDATE `creature_template` SET `subname` = 'Journeyman Leatherworker' WHERE `ent
 UPDATE `creature_template` SET `subname` = 'Skinner'                  WHERE `entry` = 6387;-- Dranh <Skinner>
 UPDATE `creature_template` SET `subname` = 'Master Goblin Engineer'   WHERE `entry` = 8738;-- Vazario Linkgrease <Master Goblin Engineer>
 
-UPDATE `creature_template` SET `minlevel` = 15, `maxlevel` = 17 WHERE `entry` = 3634;  -- Deviate Stalker
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 3615;  -- Devrak <Wind Rider Master>
-UPDATE `creature_template` SET `minlevel` = 19, `maxlevel` = 19 WHERE `entry` = 3652;  -- Trigore the Lasher
-UPDATE `creature_template` SET `minlevel` = 20, `maxlevel` = 20 WHERE `entry` = 3672;  -- Boahn <Druid of the Fang>
-UPDATE `creature_template` SET `minlevel` = 40, `maxlevel` = 40 WHERE `entry` = 4380;  -- Darkmist Widow
-UPDATE `creature_template` SET `minlevel` = 25, `maxlevel` = 25 WHERE `entry` = 5797;  -- Aean Swiftriver <Alliance Outrunner>
-UPDATE `creature_template` SET `minlevel` = 24, `maxlevel` = 24 WHERE `entry` = 5800;  -- Marcus Bel <Alliance Outrunner>
-UPDATE `creature_template` SET `minlevel` = 19, `maxlevel` = 19 WHERE `entry` = 5835;  -- Foreman Grills
-UPDATE `creature_template` SET `minlevel` = 15, `maxlevel` = 15 WHERE `entry` = 8236;  -- Muck Frenzy
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 10378; -- Omusa Thunderhorn <Wind Rider Master>
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 14717; -- Horde Elite
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 16227; -- Bragok <Flight Master>
-
-UPDATE `creature_template` SET `rank` = 1 WHERE `entry` IN (
-3630,   -- Deviate Coiler
-3631,   -- Deviate Stinglash
-3632,   -- Deviate Creeper
-3633,   -- Deviate Slayer
-3634,   -- Deviate Stalker
-3638,   -- Devouring Ectoplasm
-3641,   -- Deviate Lurker
-6132,   -- Razorfen Servitor
-7872,   -- Death's Head Cultist
-7873,   -- Razorfen Battleguard
-7874,   -- Razorfen Thornweaver
-12865   -- Ambassador Malcin
-); 
-
-UPDATE `creature_template` SET `rank` = 2 WHERE `entry` IN (
-3652, -- Trigore the Lasher
-3672, -- Boahn <Druid of the Fang>
-7895  -- Ambassador Bloodrage
-);
-
-UPDATE `creature_template` SET `rank` = 4      WHERE `entry` = 4380; -- Darkmist Widow
-UPDATE `creature_template` SET `faction` = 16  WHERE `entry` = 3503; -- Silithid Protector
 UPDATE `creature_template` SET `gossip_menu_id` = 0, `npcflag` = 2 WHERE `entry` = 3443; -- Grub
 UPDATE `creature_template_model` SET `CreatureDisplayID` = 4244    WHERE `CreatureID` = 3465;-- Gilthares Firebough
 
diff --git a/data/sql/world/base/zone_dun_morogh.sql b/data/sql/world/base/zone_dun_morogh.sql
index f5fed82..68efcb0 100644
--- a/data/sql/world/base/zone_dun_morogh.sql
+++ b/data/sql/world/base/zone_dun_morogh.sql
@@ -124,8 +124,3 @@ UPDATE `quest_template_addon` SET `SpecialFlags` = 0 WHERE `ID` = 1599;
 -- Thamner Pol <Physician> 
 DELETE FROM `npc_trainer` WHERE `ID` = 2326;
 INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (2326, -350000);
-
-
-UPDATE `creature_template` SET `faction` = 107 WHERE `entry` = 706; -- Frostmane Troll Whelp
-UPDATE `creature_template` SET `faction` = 37  WHERE `entry` = 808; -- Grik'nir the Cold
-UPDATE `creature_template` SET `faction` = 107 WHERE `entry` = 946; -- Frostmane Novice
diff --git a/data/sql/world/base/zone_durotar.sql b/data/sql/world/base/zone_durotar.sql
index 7b512ae..0dc14c9 100644
--- a/data/sql/world/base/zone_durotar.sql
+++ b/data/sql/world/base/zone_durotar.sql
@@ -261,11 +261,6 @@ INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `positio
 (123220, 56, 52.673, -3894.57, 42.6995, NULL, 0, 0, 0, 100, 0);
 
 
-UPDATE `creature_template` SET `faction` = 14 WHERE `entry` = 3101; -- Vile Familiar
-UPDATE `creature_template` SET `faction` = 14 WHERE `entry` = 3102; -- Felstalker
-UPDATE `creature_template` SET `faction` = 16 WHERE `entry` = 3183; -- Yarrog Baneshadow
-
-
 DELETE FROM `npc_trainer` WHERE `ID` IN (3174, 3175, 3184, 3185, 5943, 7953, 11025);
 INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES
 (3174, -310000),  -- Dwukk <Journeyman Blacksmith>
diff --git a/data/sql/world/base/zone_elwynn_forest.sql b/data/sql/world/base/zone_elwynn_forest.sql
index f2532b3..868d75d 100644
--- a/data/sql/world/base/zone_elwynn_forest.sql
+++ b/data/sql/world/base/zone_elwynn_forest.sql
@@ -120,10 +120,6 @@ INSERT INTO `creature_questender` (`id`, `quest`) VALUES (459, 1598);
 DELETE FROM `creature_queststarter` WHERE `id` = 459 AND `quest` = 1598;
 INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (459, 1598);
 
--- update creature factions
-UPDATE `creature_template` SET `faction` = 17 WHERE `entry` = 38;  -- Defias Thug
-UPDATE `creature_template` SET `faction` = 17 WHERE `entry` = 103; -- Garrick Padfoot
-
 -- update creature models
 UPDATE `creature_template_model` SET `CreatureDisplayID` = 604   WHERE `CreatureID` = 69;  -- Diseased Timber Wolf
 UPDATE `creature_template_model` SET `CreatureDisplayID` = 10912 WHERE `CreatureID` = 257; -- Kobold Worker
@@ -146,9 +142,6 @@ UPDATE `creature_template` SET `subname` = 'Expert Leatherworker'     WHERE `ent
 UPDATE `creature_template` SET `subname` = 'Skinner'                  WHERE `entry` = 6306; -- Helene Peltskinner <Skinner>
 UPDATE `creature_template` SET `subname` = 'Journeyman Alchemist', `npcflag` = 81, `trainer_type` = 2 WHERE `entry` = 5500; -- Tel'Athir <Apprentice Alchemist>
 UPDATE `creature_template` SET `subname` = 'Expert Tailor',        `npcflag` = 81, `trainer_type` = 2 WHERE `entry` = 5567; -- Sellandus <Apprentice Tailor>
--- update creature levels
-UPDATE `creature_template` SET `maxlevel` = 4 WHERE `entry` = 80;                     -- Kobold Laborer
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 1642; -- Northshire Guard
 
 DELETE FROM `creature_template_addon` WHERE `entry` = 69;  -- Diseased Timber Wolf
 DELETE FROM `creature_template_addon` WHERE `entry` = 299; -- Diseased Young Wolf
diff --git a/data/sql/world/base/zone_felwood.sql b/data/sql/world/base/zone_felwood.sql
index 5eab22e..d5478bb 100644
--- a/data/sql/world/base/zone_felwood.sql
+++ b/data/sql/world/base/zone_felwood.sql
@@ -140,6 +140,3 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan
 
 -- Ragepaw, fix movement
 UPDATE `creature` SET `MovementType` = 1, `wander_distance` = 5 WHERE `id1` = 14342;
-
--- Olm the Wise, Cenarion Circle
-UPDATE `creature_template` SET `faction` = 1254 WHERE `entry` = 14343;
diff --git a/data/sql/world/base/zone_mulgore.sql b/data/sql/world/base/zone_mulgore.sql
index e08f734..03daad6 100644
--- a/data/sql/world/base/zone_mulgore.sql
+++ b/data/sql/world/base/zone_mulgore.sql
@@ -262,11 +262,6 @@ INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `positio
 (260000, 22, -2245.92, -1344.81, 30.1417, NULL, 0, 0, 0, 100, 0);
 
 
--- update npc factions
-UPDATE `creature_template` SET `faction` = 14  WHERE `entry` IN (2966, 3229, 8554);       -- Battleboar, Squealer Thornmantle, Chief Sharptusk Thornmantle
-UPDATE `creature_template` SET `faction` = 57  WHERE `entry` IN (2989, 2990);       -- Bael'dun Digger, Appraiser
-UPDATE `creature_template` SET `faction` = 111 WHERE `entry` IN (2952, 2953, 2954); -- Bristleback Quilboar, Shaman, Battleboar
-
 -- update npc names
 UPDATE `creature_template` SET `subname` = 'Journeyman Leatherworker'  WHERE `entry` = 3069;  -- Chaw Stronghide <Journeyman Leatherworker>
 UPDATE `creature_template` SET `subname` = 'Armorer and Shieldcrafter' WHERE `entry` = 3075;  -- Bronk Steelrage
@@ -274,8 +269,6 @@ UPDATE `creature_template` SET `subname` = 'Fisherman'                 WHERE `en
 UPDATE `creature_template` SET `subname` = 'Skinner'                   WHERE `entry` = 6290;  -- Yonn Deepcut <Skinner>
 UPDATE `creature_template` SET `subname` = 'Journeyman Engineer'       WHERE `entry` = 10993; -- Twizwick Sprocketgrind <Journeyman Engineer>
 
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` IN (3210, 3211, 7975); -- guards
-
 
 DELETE FROM `npc_trainer` WHERE `ID` IN (3069, 3690, 5938, 5939, 6290, 10993);
 INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES 
diff --git a/data/sql/world/base/zone_orgrimmar.sql b/data/sql/world/base/zone_orgrimmar.sql
index 8b4c572..10ffc32 100644
--- a/data/sql/world/base/zone_orgrimmar.sql
+++ b/data/sql/world/base/zone_orgrimmar.sql
@@ -112,17 +112,6 @@ UPDATE `creature_template` SET `subname` = 'General Trade Goods Merchant' WHERE
 UPDATE `creature_template` SET `subname` = 'King of Darkspear Trolls'     WHERE `entry` = 10540; -- Vol'jin <King of Darkspear Trolls>
 UPDATE `creature_template` SET `subname` = 'Zeppelin Master'              WHERE `entry` = 12136; -- Snurk Bucksquick <Zeppelin Master>
 
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 3296;  -- Orgrimmar Grunt
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 3310;  -- Doras <Wind Rider Master>
-UPDATE `creature_template` SET `minlevel` = 63, `maxlevel` = 63 WHERE `entry` = 4949;  -- Thrall <Warchief>
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 10540; -- Vol'jin <King of Darkspear Trolls>
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14375; -- Scout Stronghand
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14376; -- Scout Manslayer
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14377; -- Scout Tharr
-UPDATE `creature_template` SET `minlevel` = 62, `maxlevel` = 62 WHERE `entry` = 14720; -- High Overlord Saurfang
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `rank` = 0 WHERE `entry` = 14304; -- Kor'kron Elite
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `rank` = 0 WHERE `entry` = 15350; -- Horde Warbringer
-
 -- Legionnaire Teena
 UPDATE `creature_template` SET `subname`= NULL, `npcflag` = 0, `faction` = 85 WHERE `entry` = 12788;
 UPDATE `creature_template_locale` SET `Title` = NULL WHERE `entry` = 12788;
diff --git a/data/sql/world/base/zone_stormwind.sql b/data/sql/world/base/zone_stormwind.sql
index 08dd424..5a3f0ff 100644
--- a/data/sql/world/base/zone_stormwind.sql
+++ b/data/sql/world/base/zone_stormwind.sql
@@ -65,20 +65,8 @@ INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `posit
 
 UPDATE `creature` SET `equipment_id` = 1 WHERE `id1` = 12805; -- Officer Areyn <Accessories Quartermaster>
 
-
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 68;    -- Stormwind City Guard
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 352;   -- Dungar Longdrink <Gryphon Master>
-UPDATE `creature_template` SET `minlevel` = 62, `maxlevel` = 62 WHERE `entry` = 466;   -- General Marcus Jonathan <High Commander of Stormwind Defense>
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 1976;  -- Stormwind City Patroller
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 1756;  -- Stormwind Royal Guard
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14423; -- Officer Jaxon
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14438; -- Officer Pomeroy
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14439; -- Officer Brady
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 15351; -- Alliance Brigadier General
 UPDATE `creature_template` SET `minlevel` = 63, `maxlevel` = 63 WHERE `entry` = 29611; -- King Varian Wrynn
 
-UPDATE `creature_template` SET `rank` = 0 WHERE `entry` IN (1756, 15351);
-
 UPDATE `creature_template` SET `subname` = 'Arcane Goods Vendor' WHERE `entry` = 1257; -- Keldric Boucher <Alchemy Supplies & Reagents>
 UPDATE `creature_template` SET `subname` = 'Reagent Vendor'  WHERE `entry` = 1275; -- Kyra Boucher <Reagents>
 UPDATE `creature_template` SET `subname` = 'Trade Supplier'  WHERE `entry` = 1286; -- Edna Mullby <Trade Supplies>
@@ -88,7 +76,7 @@ UPDATE `creature_template` SET `subname` = 'Reagent Vendor'  WHERE `entry` = 135
 UPDATE `creature_template` SET `subname` = 'Weapon Crafter'  WHERE `entry` = 7232; -- Borgus Steelhand <Weapon Crafter>
 
 -- Lieutenant Rachel Vaccar <Outland Armor Quartermaster>
-UPDATE `creature_template` SET `subname` = NULL, `minlevel` = 55, `maxlevel` = 55, `npcflag` = 0 WHERE `entry` = 12778;
+UPDATE `creature_template` SET `subname` = NULL, `npcflag` = 0 WHERE `entry` = 12778;
 UPDATE `creature_template_locale` SET `Title` = NULL WHERE `entry` = 12778;
 
 
diff --git a/data/sql/world/base/zone_teldrassil.sql b/data/sql/world/base/zone_teldrassil.sql
index 6efe225..ded242e 100644
--- a/data/sql/world/base/zone_teldrassil.sql
+++ b/data/sql/world/base/zone_teldrassil.sql
@@ -72,6 +72,3 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 -- Byancie <First Aid Trainer> 
 DELETE FROM `npc_trainer` WHERE `ID`=6094; 
 INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (6094, -350000); 
-
-UPDATE `creature_template` SET `faction` = 22 WHERE `entry` = 1986; -- Webwood Spider
-UPDATE `creature_template` SET `faction` = 22 WHERE `entry` = 1994; -- Githyiss the Vile
diff --git a/data/sql/world/base/zone_thunder_bluff.sql b/data/sql/world/base/zone_thunder_bluff.sql
index 2fd8e9d..bac1edf 100644
--- a/data/sql/world/base/zone_thunder_bluff.sql
+++ b/data/sql/world/base/zone_thunder_bluff.sql
@@ -76,12 +76,6 @@ UPDATE `creature_template` SET `subname` = 'Reagent Vendor'            WHERE `en
 UPDATE `creature_template` SET `subname` = 'General Goods Vendor'      WHERE `entry` = 8362;-- Kuruk <General Goods Vendor>
 UPDATE `creature_template` SET `subname` = 'Trade Goods Supplier'      WHERE `entry` = 8363;-- Shadi Mistrunner <Trade Goods Supplier>
 
-UPDATE `creature_template` SET `minlevel` = 63, `maxlevel` = 63 WHERE `entry` = 3057;  -- Cairne Bloodhoof <High Chieftain>
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14440; -- Hunter Sagewind
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14441; -- Hunter Ragetotem
-UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `rank` = 0      WHERE `entry` = 3083; -- Honor Guard
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55, `faction` = 105 WHERE `entry` = 3084; -- Bluffwatcher
-
 
 -- Kurm Stonehoof <Mining Supplier>
 DELETE FROM `npc_vendor` WHERE `entry`=3002 AND `item` IN (20815, 20824);
diff --git a/data/sql/world/base/zone_tirisfal_glades.sql b/data/sql/world/base/zone_tirisfal_glades.sql
index 3d1c9b5..e0583ba 100644
--- a/data/sql/world/base/zone_tirisfal_glades.sql
+++ b/data/sql/world/base/zone_tirisfal_glades.sql
@@ -132,29 +132,6 @@ UPDATE `creature_template` SET `subname` = 'Demon Trainer'            WHERE `ent
 UPDATE `creature_template` SET `subname` = 'Skinner'                  WHERE `entry` = 6289; -- Rand Rhobart <Skinner>
 UPDATE `creature_template` SET `subname` = 'Zeppelin Master'          WHERE `entry` = 9566; -- Zapetta <Zeppelin Master>
 
--- update npc factions
-UPDATE `creature_template` SET `faction` = 22 WHERE `entry` = 1505;  -- Night Web Spider
-UPDATE `creature_template` SET `faction` = 67 WHERE `entry` = 1506;  -- Scarlet Convert
-UPDATE `creature_template` SET `faction` = 67 WHERE `entry` = 1507;  -- Scarlet Initiate
-UPDATE `creature_template` SET `faction` = 67 WHERE `entry` = 1667;  -- Meven Korgal
-UPDATE `creature_template` SET `faction` = 22 WHERE `entry` = 1688;  -- Night Web Matriarch
-UPDATE `creature_template` SET `faction` = 67 WHERE `entry` = 13158; -- Lieutenant Sanders
-
--- update npc levels
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 1736; -- Deathguard Randolph
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 1737; -- Deathguard Oliver
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 1739; -- Deathguard Phillip
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 1741; -- Deathguard Bartrand
-UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 7980; -- Deathguard Elite
-
--- update npc ranks
-UPDATE `creature_template` SET `rank` = 1 WHERE `entry` = 4280; -- Scarlet Preserver
-UPDATE `creature_template` SET `rank` = 1 WHERE `entry` = 4281; -- Scarlet Scout
-UPDATE `creature_template` SET `rank` = 1 WHERE `entry` = 4282; -- Scarlet Magician
-UPDATE `creature_template` SET `rank` = 1 WHERE `entry` = 4283; -- Scarlet Sentry
-UPDATE `creature_template` SET `rank` = 1 WHERE `entry` = 4284; -- Scarlet Augur
-UPDATE `creature_template` SET `rank` = 1 WHERE `entry` = 4285; -- Scarlet Disciple
-
 DELETE FROM `npc_trainer` WHERE `ID` IN (2114, 2132, 3549, 4773, 5690, 5695, 5759, 6289);
 INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES 
 (2114, -370000), -- Faruza <Apprentice Herbalist>