diff --git a/sql/world/base/professions.sql b/sql/world/base/professions.sql
index d979b44..57639d6 100644
--- a/sql/world/base/professions.sql
+++ b/sql/world/base/professions.sql
@@ -28,9 +28,18 @@ UPDATE quest_template SET RewardItem3 = 16085, RewardAmount3 = 1 WHERE ID IN (66
 UPDATE `item_template` SET `description` = 'Teaches you advanced first aid, allowing a maximum of 300 first aid skill.' WHERE `entry` = 16085;
 
 -- TBC First Aid vendors
-UPDATE `creature_template` SET `npcflag` = 128 WHERE `entry` IN (18990, 18991);
-DELETE FROM `npc_trainer` WHERE `ID` IN (18990, 18991);
+UPDATE `creature_template` SET `npcflag` = 128 WHERE `entry` IN (18990, 18991); -- set to vendors, no longer trainers
 
+DELETE FROM `npc_trainer` WHERE `ID` IN (16272, 16731, 17214, 17424, 18990, 18991, 19184, 19478, 22477);
+INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES 
+(16272, -350000), -- Kanaria, Eversong Woods
+(16731, -350000), -- Nus, The Exodar
+(17214, -350000), -- Anchorite Fateema, Azuremyst Isle
+(17424, -350000), -- Anchorite Paetheus, Bloodmyst Isle
+(19184, -350000), -- Mildred Fletcher, Shattrath
+(19478, -350000), -- Fera Palerunner, Blades Edge Mountains
+(22477, -350000); -- Anchorite Ensham, Terokkar Forest
+   
 -- Make Brilliant Glass craft only available once WotLK is reached, to avoid early access to epic TBC gems
 UPDATE `npc_trainer` SET `ReqLevel` = 71 WHERE `SpellID` = 47280;
 
diff --git a/sql/world/base/zone_azuremyst_isle.sql b/sql/world/base/zone_azuremyst_isle.sql
deleted file mode 100644
index a41bd59..0000000
--- a/sql/world/base/zone_azuremyst_isle.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Anchorite Fateema <First Aid Trainer> 
-DELETE FROM `npc_trainer` WHERE `ID`=17214; 
-INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (17214, -350000); 
diff --git a/sql/world/base/zone_blades_edge_mountains.sql b/sql/world/base/zone_blades_edge_mountains.sql
deleted file mode 100644
index 8a13969..0000000
--- a/sql/world/base/zone_blades_edge_mountains.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Fera Palerunner <First Aid Trainer> 
-DELETE FROM `npc_trainer` WHERE `ID`=19478; 
-INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (19478, -350000); 
diff --git a/sql/world/base/zone_bloodmyst_isle.sql b/sql/world/base/zone_bloodmyst_isle.sql
deleted file mode 100644
index 2aeaddb..0000000
--- a/sql/world/base/zone_bloodmyst_isle.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Anchorite Paetheus <First Aid Trainer> 
-DELETE FROM `npc_trainer` WHERE `ID`=17424; 
-INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (17424, -350000); 
diff --git a/sql/world/base/zone_eversong_woods.sql b/sql/world/base/zone_eversong_woods.sql
index 3714078..4f48210 100644
--- a/sql/world/base/zone_eversong_woods.sql
+++ b/sql/world/base/zone_eversong_woods.sql
@@ -9,7 +9,3 @@ INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (15283, 8344);
 DELETE FROM `creature_loot_template` WHERE `Entry`= 15298 AND `Item`=20935;
 INSERT INTO `creature_loot_template` (Entry, Item, Reference, Chance, QuestRequired, LootMode, GroupId, MinCount, MaxCount, Comment) VALUES
 (15298, 20935, 0, 80, 1, 1, 0, 1, 1, 'Tainted Arcane Wraith - Tainted Wraith Essence');
-
- -- Kanaria <First Aid Trainer> 
- DELETE FROM `npc_trainer` WHERE `ID`=16272; 
- INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (16272, -350000); 
diff --git a/sql/world/base/zone_shattrath.sql b/sql/world/base/zone_shattrath.sql
index d473f1e..d5d8365 100644
--- a/sql/world/base/zone_shattrath.sql
+++ b/sql/world/base/zone_shattrath.sql
@@ -2,7 +2,3 @@
 DELETE FROM `npc_vendor` WHERE `entry`=18756 AND `item`=38089 AND `ExtendedCost`=0;
 INSERT INTO `npc_vendor` (`entry`, `slot`, `item`, `maxcount`, `incrtime`, `ExtendedCost`, `VerifiedBuild`) VALUES
 (18756, 0, 38089, 1, 1800, 0, 0);
-
--- Mildred Fletcher <Physician>
-DELETE FROM `npc_trainer` WHERE `ID`=19184; 
-INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (19184, -350000); 
diff --git a/sql/world/base/zone_terokkar_forest.sql b/sql/world/base/zone_terokkar_forest.sql
deleted file mode 100644
index 784019f..0000000
--- a/sql/world/base/zone_terokkar_forest.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Anchorite Ensham <First Aid Trainer> 
-DELETE FROM `npc_trainer` WHERE `ID`=22477; 
-INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (22477, -350000); 
diff --git a/sql/world/base/zone_the_exodar.sql b/sql/world/base/zone_the_exodar.sql
deleted file mode 100644
index c267d51..0000000
--- a/sql/world/base/zone_the_exodar.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Nus <First Aid Trainer> 
-DELETE FROM `npc_trainer` WHERE `ID`=16731; 
-INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (16731, -350000);