diff --git a/sql/world/base/dungeon_onyxia.sql b/sql/world/base/dungeon_onyxia.sql
index 860349f..dd1db3b 100644
--- a/sql/world/base/dungeon_onyxia.sql
+++ b/sql/world/base/dungeon_onyxia.sql
@@ -1012,7 +1012,6 @@ INSERT INTO spell_linked_spell (spell_trigger, spell_effect, TYPE, COMMENT) VALU
 
 UPDATE `quest_template_addon` SET `SpecialFlags` = 0 WHERE `id` = 7509;
 
-DELETE FROM `areatrigger_teleport` WHERE `ID` = 2848;
 INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES
 (2848, 'onyxia_entrance_trigger');
 
diff --git a/sql/world/base/optional_remove_heirlooms.sql b/sql/world/base/optional_remove_heirlooms.sql
index 81ca4cd..b28aa1b 100644
--- a/sql/world/base/optional_remove_heirlooms.sql
+++ b/sql/world/base/optional_remove_heirlooms.sql
@@ -2,6 +2,7 @@
    This optional file removes Heirloom vendors with no other purpose, and removes heirlooms from all other vendors so they are not available.
    If you would like heirlooms to still be available, comment out, remove, or just do not run this file. */
 DELETE FROM `creature` WHERE `id1` IN (32509, 35507, 35508);
+DELETE FROM `creature_addon` WHERE `guid` IN (85227, 88108);
 DELETE FROM `npc_vendor` WHERE `item` IN ( 38691, 42943, 42944, 42945, 42946,
 42947, 42948, 42949, 42950, 42951, 42952, 42984, 42985, 42991, 42992, 44090,
 44091, 44092, 44093, 44094, 44095, 44096, 44097, 44098, 44099, 44100, 44101,