diff --git a/ACID/acid_tbc.sql b/ACID/acid_tbc.sql
index b32153f7e..71749cf7b 100644
--- a/ACID/acid_tbc.sql
+++ b/ACID/acid_tbc.sql
@@ -16904,6 +16904,8 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 ('1683605','16836','9','0','100','1025','0','40','3400','4700','0','0','11','20824','1','256','0','0','0','0','0','0','0','0','Escaped Dreghood - Cast Lightning Bolt'),
 -- Honor Hold Defender 16842
 ('1684201','16842','11','0','100','0','0','0','0','0','0','0','11','18950','0','34','0','0','0','0','0','0','0','0','Honor Hold Defender - Cast Invisibility and Stealth Detection on Spawn'),
+('1684202','-72636','11','0','100','0','0','0','0','0','0','0','3','0','16387','0','0','0','0','0','0','0','0','0','Honor Hold Defender - Set Model on Spawn'),
+('1684203','-72637','11','0','100','0','0','0','0','0','0','0','3','0','16387','0','0','0','0','0','0','0','0','0','Honor Hold Defender - Set Model on Spawn'),
 -- Crust Burster (16844) - npc_burster_worm
 -- Stormwind Cavalryman
 ('1684301','16843','4','0','100','0','0','0','0','0','0','0','43','0','0','0','0','0','0','0','0','0','0','0','Stormwind Cavalryman - Dismount on Aggro'),
diff --git a/Updates/0604_creature_modelid.sql b/Updates/0604_creature_modelid.sql
new file mode 100644
index 000000000..d56b7a793
--- /dev/null
+++ b/Updates/0604_creature_modelid.sql
@@ -0,0 +1,32 @@
+-- Remove remaining cases where `creature`.`modelid` != 0
+-- Obsolte column can be removed! (Implementing probability column seems questionable)
+UPDATE `creature` SET `modelid` = 0 WHERE `id` IN (16842,21419,22332,22418,19937,17432,17439,25195);
+
+/*
+Time: 02/02/2008 00:09:06.000 Number: 117822
+Entry: 22332
+[0] Name: Brood of Neltharaku
+[1] Name:
+[2] Name:
+[3] Name:
+Sub Name:
+Icon Name:
+Type Flags: None (0)
+Type: Dragonkin (2)
+Family: None (0)
+Rank: Elite (1)
+Unk Int: 0
+Pet Spell Data Id: 0
+[0] Display ID: 19980
+[1] Display ID: 0
+[2] Display ID: 0
+[3] Display ID: 0
+HealthMultriplier: 4
+ManaMultiplier: 3
+Racial Leader: False
+
+[1] (46) UNIT_FIELD_FLAGS: (33600) Unk6, NotAttackbleByPlayerControlled, OnlyAttackableByPlayerControlled, OnlySwim
+[1] (152) UNIT_FIELD_DISPLAYID: 19980
+maybe invisible?
+*/
+
diff --git a/utilities/cmangos_custom.sql b/utilities/cmangos_custom.sql
index 0ea602ff9..65704e004 100644
--- a/utilities/cmangos_custom.sql
+++ b/utilities/cmangos_custom.sql
@@ -200,19 +200,32 @@ UPDATE broadcast_text SET `text`="Should Kil'jaeden rise up through the Sunwell
 
 -- modelids with probability = 0
 UPDATE creature_template SET `modelid2` = 0, `modelid3` = 0, `modelid4` = 0 WHERE `entry` IN (
+17432, -- Stillpine Defender (2001,6802,8589)
+17439, -- Stillpine Hunter (2001,6802,8589)
 17734, -- Underbog Lord
 17459, -- Chess Waiting Room (DND)
 18095, -- Doomfire
 18104, -- Doomfire Targeting
 19632, -- Lykul Stinger (6633,7350,11091)
+19937, -- Commander Hogarth (16503,16504,16505)
 20155, -- Hillsbrad Internment Lodge Quest Trigger
 20156, -- Thrall Quest Trigger
 21060, -- Enraged Air Spirit (15294)
+25195, -- Marksman Bova (18742,18741,18740)
 25265, -- Demonic Vapor
 25267, -- Demonic Vapor (Trail)
 25703 -- Brutallus Death Cloud
 );
 
+UPDATE creature_template SET `modelid1` = 0, `modelid3` = 0, `modelid4` = 0 WHERE `entry` IN (
+21419, -- Infernal Attacker - modelid1 (17312)
+22418 -- Archimonde Channel Target (18783)
+);
+
+UPDATE creature_template SET `modelid2` = 17188 WHERE `entry` = 22332; -- Brood of Neltharaku (19980)
+
+-- -------------------------------
+
 UPDATE `creature_template` SET `name` = 'Redeemed Spirit of Earth' WHERE `entry` = 21739; -- Redeemed Spriit of Earth
 
 -- -------------------------------