87 files changed, 45 insertions, 18 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index c2401205e08..43758eda6c1 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -86,25 +86,9 @@ UPDATE `gameobject_template` SET `ScriptName`='go_dragonflayer_cage' WHERE entry
 UPDATE `gameobject_template` SET `ScriptName`='go_black_cage' WHERE `entry`=195310;
 
 /* GUARD */
-UPDATE `creature_template` SET `ScriptName`='guard_azuremyst' WHERE `entry`=18038;
+UPDATE `creature_template` SET `ScriptName`='guard_generic' WHERE `entry` IN (727,1423,1735,1738,1742,1743,1744,1745,1746,2209,2210,3084,3212,3215,3217,3218,3219,3220,3221,3222,3223,3224,3502,3571,4262,4264,5595,5624,5725,5953,9460,11190,13076,15184,16221,16222,16733,18038,19687);
 UPDATE `creature_template` SET `ScriptName`='guard_orgrimmar' WHERE `entry`=3296;
 UPDATE `creature_template` SET `ScriptName`='guard_stormwind' WHERE `entry` IN (68,1976);
-UPDATE `creature_template` SET `ScriptName`='guard_contested' WHERE `entry` IN (9460,4624,3502,11190,15184);
-UPDATE `creature_template` SET `ScriptName`='guard_elwynnforest' WHERE `entry`=1423;
-UPDATE `creature_template` SET `ScriptName`='guard_eversong' WHERE `entry`=16221;
-UPDATE `creature_template` SET `ScriptName`='guard_darnassus' WHERE `entry`=4262;
-UPDATE `creature_template` SET `ScriptName`='guard_teldrassil' WHERE `entry`=3571;
-UPDATE `creature_template` SET `ScriptName`='guard_ironforge' WHERE `entry`=5595;
-UPDATE `creature_template` SET `ScriptName`='guard_dunmorogh' WHERE `entry` IN (727,13076);
-UPDATE `creature_template` SET `ScriptName`='guard_undercity' WHERE `entry`=5624;
-UPDATE `creature_template` SET `ScriptName`='guard_bluffwatcher' WHERE `entry`=3084;
-UPDATE `creature_template` SET `ScriptName`='guard_durotar' WHERE `entry`=5953;
-UPDATE `creature_template` SET `ScriptName`='guard_mulgore' WHERE `entry` IN (3212,3215,3217,3218,3219,3220,3221,3222,3223,3224);
-UPDATE `creature_template` SET `ScriptName`='guard_dunmorogh' WHERE `entry` IN (727,13076);
-UPDATE `creature_template` SET `ScriptName`='guard_tirisfal' WHERE `entry` IN (1735,1738,2210,1744,1745,5725,1743,2209,1746,1742);
-UPDATE `creature_template` SET `ScriptName`='guard_silvermoon' WHERE `entry`=16222;
-UPDATE `creature_template` SET `ScriptName`='guard_exodar' WHERE `entry`=16733;
-UPDATE `creature_template` SET `ScriptName`='guard_shattrath' WHERE `entry`=19687;
 UPDATE `creature_template` SET `ScriptName`='guard_shattrath_aldor' WHERE `entry`=18549;
 UPDATE `creature_template` SET `ScriptName`='guard_shattrath_scryer' WHERE `entry`=18568;
 
diff --git a/sql/updates/7928_world_quest_template.sql b/sql/updates/3.3.3a_old/7928_world_quest_template.sql
index dbfceefb53f..dbfceefb53f 100644
--- a/sql/updates/7928_world_quest_template.sql
+++ b/sql/updates/3.3.3a_old/7928_world_quest_template.sql
diff --git a/sql/updates/7930_world_scriptname.sql b/sql/updates/3.3.3a_old/7930_world_scriptname.sql
index c94162e8eb1..c94162e8eb1 100644
--- a/sql/updates/7930_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/7930_world_scriptname.sql
diff --git a/sql/updates/7963_world_scriptname.sql b/sql/updates/3.3.3a_old/7963_world_scriptname.sql
index 8a6136c256f..8a6136c256f 100644
--- a/sql/updates/7963_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/7963_world_scriptname.sql
diff --git a/sql/updates/7973_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/7973_world_spell_proc_event.sql
index 9092729022e..9092729022e 100644
--- a/sql/updates/7973_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/7973_world_spell_proc_event.sql
diff --git a/sql/updates/7974_characters_character_aura.sql b/sql/updates/3.3.3a_old/7974_characters_character_aura.sql
index 3ea3fcb6917..3ea3fcb6917 100644
--- a/sql/updates/7974_characters_character_aura.sql
+++ b/sql/updates/3.3.3a_old/7974_characters_character_aura.sql
diff --git a/sql/updates/7981_world_season_linked_event.sql b/sql/updates/3.3.3a_old/7981_world_season_linked_event.sql
index b61d9f0d7bd..b61d9f0d7bd 100644
--- a/sql/updates/7981_world_season_linked_event.sql
+++ b/sql/updates/3.3.3a_old/7981_world_season_linked_event.sql
diff --git a/sql/updates/7982_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/7982_world_spell_proc_event.sql
index 0f21c884c75..0f21c884c75 100644
--- a/sql/updates/7982_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/7982_world_spell_proc_event.sql
diff --git a/sql/updates/7988_world_scriptname.sql b/sql/updates/3.3.3a_old/7988_world_scriptname.sql
index 1b90f914ea0..1b90f914ea0 100644
--- a/sql/updates/7988_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/7988_world_scriptname.sql
diff --git a/sql/updates/8004_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8004_world_spell_proc_event.sql
index 9af9a1525dc..9af9a1525dc 100644
--- a/sql/updates/8004_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8004_world_spell_proc_event.sql
diff --git a/sql/updates/8006_world_quest_template.sql b/sql/updates/3.3.3a_old/8006_world_quest_template.sql
index 0a85d5074a2..0a85d5074a2 100644
--- a/sql/updates/8006_world_quest_template.sql
+++ b/sql/updates/3.3.3a_old/8006_world_quest_template.sql
diff --git a/sql/updates/8020_characters_item_refund_instance.sql b/sql/updates/3.3.3a_old/8020_characters_item_refund_instance.sql
index 1c79d39526c..1c79d39526c 100644
--- a/sql/updates/8020_characters_item_refund_instance.sql
+++ b/sql/updates/3.3.3a_old/8020_characters_item_refund_instance.sql
diff --git a/sql/updates/8041_world_scriptname.sql b/sql/updates/3.3.3a_old/8041_world_scriptname.sql
index b08f7dbd131..b08f7dbd131 100644
--- a/sql/updates/8041_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8041_world_scriptname.sql
diff --git a/sql/updates/8044_world_script_texts.sql b/sql/updates/3.3.3a_old/8044_world_script_texts.sql
index cb46719b5ad..cb46719b5ad 100644
--- a/sql/updates/8044_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8044_world_script_texts.sql
diff --git a/sql/updates/8044_world_script_waypoints.sql b/sql/updates/3.3.3a_old/8044_world_script_waypoints.sql
index a052751ff15..a052751ff15 100644
--- a/sql/updates/8044_world_script_waypoints.sql
+++ b/sql/updates/3.3.3a_old/8044_world_script_waypoints.sql
diff --git a/sql/updates/8044_world_scriptname.sql b/sql/updates/3.3.3a_old/8044_world_scriptname.sql
index 04e363595d3..04e363595d3 100644
--- a/sql/updates/8044_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8044_world_scriptname.sql
diff --git a/sql/updates/8048_characters_item_refund_instance.sql b/sql/updates/3.3.3a_old/8048_characters_item_refund_instance.sql
index c873fc492d3..c873fc492d3 100644
--- a/sql/updates/8048_characters_item_refund_instance.sql
+++ b/sql/updates/3.3.3a_old/8048_characters_item_refund_instance.sql
diff --git a/sql/updates/8049_world_npc_vendor.sql b/sql/updates/3.3.3a_old/8049_world_npc_vendor.sql
index c09d579f725..c09d579f725 100644
--- a/sql/updates/8049_world_npc_vendor.sql
+++ b/sql/updates/3.3.3a_old/8049_world_npc_vendor.sql
diff --git a/sql/updates/8049_world_trinity_strings.sql b/sql/updates/3.3.3a_old/8049_world_trinity_strings.sql
index e04e776a3e8..e04e776a3e8 100644
--- a/sql/updates/8049_world_trinity_strings.sql
+++ b/sql/updates/3.3.3a_old/8049_world_trinity_strings.sql
diff --git a/sql/updates/8051_world_script_texts.sql b/sql/updates/3.3.3a_old/8051_world_script_texts.sql
index ca1a8d593a1..ca1a8d593a1 100644
--- a/sql/updates/8051_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8051_world_script_texts.sql
diff --git a/sql/updates/8051_world_scriptname.sql b/sql/updates/3.3.3a_old/8051_world_scriptname.sql
index 6e6656dc9ca..6e6656dc9ca 100644
--- a/sql/updates/8051_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8051_world_scriptname.sql
diff --git a/sql/updates/8052_world_script_texts.sql b/sql/updates/3.3.3a_old/8052_world_script_texts.sql
index 986e3852a33..986e3852a33 100644
--- a/sql/updates/8052_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8052_world_script_texts.sql
diff --git a/sql/updates/8052_world_script_waypoint.sql b/sql/updates/3.3.3a_old/8052_world_script_waypoint.sql
index 37713174384..37713174384 100644
--- a/sql/updates/8052_world_script_waypoint.sql
+++ b/sql/updates/3.3.3a_old/8052_world_script_waypoint.sql
diff --git a/sql/updates/8052_world_scriptname.sql b/sql/updates/3.3.3a_old/8052_world_scriptname.sql
index 4121d15f2e9..4121d15f2e9 100644
--- a/sql/updates/8052_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8052_world_scriptname.sql
diff --git a/sql/updates/8054_world_script_waypoint.sql b/sql/updates/3.3.3a_old/8054_world_script_waypoint.sql
index d87926d1a19..d87926d1a19 100644
--- a/sql/updates/8054_world_script_waypoint.sql
+++ b/sql/updates/3.3.3a_old/8054_world_script_waypoint.sql
diff --git a/sql/updates/8054_world_scriptname.sql b/sql/updates/3.3.3a_old/8054_world_scriptname.sql
index 8dc37bbf362..8dc37bbf362 100644
--- a/sql/updates/8054_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8054_world_scriptname.sql
diff --git a/sql/updates/8057_world_game_event_npc_vendor.sql b/sql/updates/3.3.3a_old/8057_world_game_event_npc_vendor.sql
index 92923390b31..92923390b31 100644
--- a/sql/updates/8057_world_game_event_npc_vendor.sql
+++ b/sql/updates/3.3.3a_old/8057_world_game_event_npc_vendor.sql
diff --git a/sql/updates/8057_world_npc_vendor.sql b/sql/updates/3.3.3a_old/8057_world_npc_vendor.sql
index 7703e035790..7703e035790 100644
--- a/sql/updates/8057_world_npc_vendor.sql
+++ b/sql/updates/3.3.3a_old/8057_world_npc_vendor.sql
diff --git a/sql/updates/8058_world_scriptname.sql b/sql/updates/3.3.3a_old/8058_world_scriptname.sql
index 92380018d70..92380018d70 100644
--- a/sql/updates/8058_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8058_world_scriptname.sql
diff --git a/sql/updates/8060_world_script_waypoint.sql b/sql/updates/3.3.3a_old/8060_world_script_waypoint.sql
index a9b7e8e2f8f..a9b7e8e2f8f 100644
--- a/sql/updates/8060_world_script_waypoint.sql
+++ b/sql/updates/3.3.3a_old/8060_world_script_waypoint.sql
diff --git a/sql/updates/8060_world_scriptname.sql b/sql/updates/3.3.3a_old/8060_world_scriptname.sql
index d7653f5d443..d7653f5d443 100644
--- a/sql/updates/8060_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8060_world_scriptname.sql
diff --git a/sql/updates/8062_world_script_texts.sql b/sql/updates/3.3.3a_old/8062_world_script_texts.sql
index e9c90834a61..e9c90834a61 100644
--- a/sql/updates/8062_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8062_world_script_texts.sql
diff --git a/sql/updates/8062_world_script_waypoint.sql b/sql/updates/3.3.3a_old/8062_world_script_waypoint.sql
index 45a5bedc7b4..45a5bedc7b4 100644
--- a/sql/updates/8062_world_script_waypoint.sql
+++ b/sql/updates/3.3.3a_old/8062_world_script_waypoint.sql
diff --git a/sql/updates/8062_world_scriptname.sql b/sql/updates/3.3.3a_old/8062_world_scriptname.sql
index b8d23093140..b8d23093140 100644
--- a/sql/updates/8062_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8062_world_scriptname.sql
diff --git a/sql/updates/8063_world_scriptname.sql b/sql/updates/3.3.3a_old/8063_world_scriptname.sql
index cc526381a4f..cc526381a4f 100644
--- a/sql/updates/8063_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8063_world_scriptname.sql
diff --git a/sql/updates/8073_world_scriptname.sql b/sql/updates/3.3.3a_old/8073_world_scriptname.sql
index e341a457b03..e341a457b03 100644
--- a/sql/updates/8073_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8073_world_scriptname.sql
diff --git a/sql/updates/8088_world_scriptname.sql b/sql/updates/3.3.3a_old/8088_world_scriptname.sql
index 149ee5a9d20..149ee5a9d20 100644
--- a/sql/updates/8088_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8088_world_scriptname.sql
diff --git a/sql/updates/8089_world_script_texts.sql b/sql/updates/3.3.3a_old/8089_world_script_texts.sql
index 39807df0f1b..39807df0f1b 100644
--- a/sql/updates/8089_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8089_world_script_texts.sql
diff --git a/sql/updates/8089_world_script_waypoint.sql b/sql/updates/3.3.3a_old/8089_world_script_waypoint.sql
index 7cd2f1a13c2..7cd2f1a13c2 100644
--- a/sql/updates/8089_world_script_waypoint.sql
+++ b/sql/updates/3.3.3a_old/8089_world_script_waypoint.sql
diff --git a/sql/updates/8089_world_scriptname.sql b/sql/updates/3.3.3a_old/8089_world_scriptname.sql
index 7797758b721..7797758b721 100644
--- a/sql/updates/8089_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8089_world_scriptname.sql
diff --git a/sql/updates/8109_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8109_world_spell_proc_event.sql
index 6776cf44817..6776cf44817 100644
--- a/sql/updates/8109_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8109_world_spell_proc_event.sql
diff --git a/sql/updates/8111_realmd_account_access.sql b/sql/updates/3.3.3a_old/8111_realmd_account_access.sql
index 82f9811fd3b..82f9811fd3b 100644
--- a/sql/updates/8111_realmd_account_access.sql
+++ b/sql/updates/3.3.3a_old/8111_realmd_account_access.sql
diff --git a/sql/updates/8116_characters_groups.sql b/sql/updates/3.3.3a_old/8116_characters_groups.sql
index a75bb274ffb..a75bb274ffb 100644
--- a/sql/updates/8116_characters_groups.sql
+++ b/sql/updates/3.3.3a_old/8116_characters_groups.sql
diff --git a/sql/updates/8122_world_scriptname.sql b/sql/updates/3.3.3a_old/8122_world_scriptname.sql
index b5ee81683ef..b5ee81683ef 100644
--- a/sql/updates/8122_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8122_world_scriptname.sql
diff --git a/sql/updates/8136_01_characters_groups.sql b/sql/updates/3.3.3a_old/8136_01_characters_groups.sql
index af0f6cb736c..af0f6cb736c 100644
--- a/sql/updates/8136_01_characters_groups.sql
+++ b/sql/updates/3.3.3a_old/8136_01_characters_groups.sql
diff --git a/sql/updates/8136_02_characters_group_member.sql b/sql/updates/3.3.3a_old/8136_02_characters_group_member.sql
index 7300e34f2f9..7300e34f2f9 100644
--- a/sql/updates/8136_02_characters_group_member.sql
+++ b/sql/updates/3.3.3a_old/8136_02_characters_group_member.sql
diff --git a/sql/updates/8136_03_characters_group_instance.sql b/sql/updates/3.3.3a_old/8136_03_characters_group_instance.sql
index 78601c14b98..78601c14b98 100644
--- a/sql/updates/8136_03_characters_group_instance.sql
+++ b/sql/updates/3.3.3a_old/8136_03_characters_group_instance.sql
diff --git a/sql/updates/8140_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8140_world_spell_proc_event.sql
index 1d569aa095d..1d569aa095d 100644
--- a/sql/updates/8140_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8140_world_spell_proc_event.sql
diff --git a/sql/updates/8156_world_scriptname.sql b/sql/updates/3.3.3a_old/8156_world_scriptname.sql
index e998312c83d..e998312c83d 100644
--- a/sql/updates/8156_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8156_world_scriptname.sql
diff --git a/sql/updates/8179_world_script_texts.sql b/sql/updates/3.3.3a_old/8179_world_script_texts.sql
index 877bdd4ff48..877bdd4ff48 100644
--- a/sql/updates/8179_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8179_world_script_texts.sql
diff --git a/sql/updates/8179_world_scriptname.sql b/sql/updates/3.3.3a_old/8179_world_scriptname.sql
index 4ecf2eca1a6..4ecf2eca1a6 100644
--- a/sql/updates/8179_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8179_world_scriptname.sql
diff --git a/sql/updates/8191_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8191_world_spell_proc_event.sql
index 5b1fac4004d..5b1fac4004d 100644
--- a/sql/updates/8191_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8191_world_spell_proc_event.sql
diff --git a/sql/updates/8197_world_spell_bonus_data.sql b/sql/updates/3.3.3a_old/8197_world_spell_bonus_data.sql
index 2a6deb43a30..2a6deb43a30 100644
--- a/sql/updates/8197_world_spell_bonus_data.sql
+++ b/sql/updates/3.3.3a_old/8197_world_spell_bonus_data.sql
diff --git a/sql/updates/8198_world_quest_template.sql b/sql/updates/3.3.3a_old/8198_world_quest_template.sql
index 73ab5c2b0c7..73ab5c2b0c7 100644
--- a/sql/updates/8198_world_quest_template.sql
+++ b/sql/updates/3.3.3a_old/8198_world_quest_template.sql
diff --git a/sql/updates/8212_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8212_world_spell_proc_event.sql
index 7d9e4f3ec25..7d9e4f3ec25 100644
--- a/sql/updates/8212_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8212_world_spell_proc_event.sql
diff --git a/sql/updates/8213_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8213_world_spell_proc_event.sql
index 75c07b90223..75c07b90223 100644
--- a/sql/updates/8213_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8213_world_spell_proc_event.sql
diff --git a/sql/updates/8214_world_command.sql b/sql/updates/3.3.3a_old/8214_world_command.sql
index 91fe023ce4d..91fe023ce4d 100644
--- a/sql/updates/8214_world_command.sql
+++ b/sql/updates/3.3.3a_old/8214_world_command.sql
diff --git a/sql/updates/8214_world_trinity_string.sql b/sql/updates/3.3.3a_old/8214_world_trinity_string.sql
index 49156eeefbd..49156eeefbd 100644
--- a/sql/updates/8214_world_trinity_string.sql
+++ b/sql/updates/3.3.3a_old/8214_world_trinity_string.sql
diff --git a/sql/updates/8215_world_spell_bonus_data.sql b/sql/updates/3.3.3a_old/8215_world_spell_bonus_data.sql
index 7bdf1bc0b6c..7bdf1bc0b6c 100644
--- a/sql/updates/8215_world_spell_bonus_data.sql
+++ b/sql/updates/3.3.3a_old/8215_world_spell_bonus_data.sql
diff --git a/sql/updates/8216_world_spell_group.sql b/sql/updates/3.3.3a_old/8216_world_spell_group.sql
index 5c0c749afca..5c0c749afca 100644
--- a/sql/updates/8216_world_spell_group.sql
+++ b/sql/updates/3.3.3a_old/8216_world_spell_group.sql
diff --git a/sql/updates/8216_world_spell_group_stack_rules.sql b/sql/updates/3.3.3a_old/8216_world_spell_group_stack_rules.sql
index fa3ff809f83..fa3ff809f83 100644
--- a/sql/updates/8216_world_spell_group_stack_rules.sql
+++ b/sql/updates/3.3.3a_old/8216_world_spell_group_stack_rules.sql
diff --git a/sql/updates/8231_world_spell_dbc.sql b/sql/updates/3.3.3a_old/8231_world_spell_dbc.sql
index 0c243d0818d..0c243d0818d 100644
--- a/sql/updates/8231_world_spell_dbc.sql
+++ b/sql/updates/3.3.3a_old/8231_world_spell_dbc.sql
diff --git a/sql/updates/8232_world_spell_dbc.sql b/sql/updates/3.3.3a_old/8232_world_spell_dbc.sql
index c5a97e17988..c5a97e17988 100644
--- a/sql/updates/8232_world_spell_dbc.sql
+++ b/sql/updates/3.3.3a_old/8232_world_spell_dbc.sql
diff --git a/sql/updates/8237_world_spell_linked_spell.sql b/sql/updates/3.3.3a_old/8237_world_spell_linked_spell.sql
index f2a5d8681f2..f2a5d8681f2 100644
--- a/sql/updates/8237_world_spell_linked_spell.sql
+++ b/sql/updates/3.3.3a_old/8237_world_spell_linked_spell.sql
diff --git a/sql/updates/8239_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8239_world_spell_proc_event.sql
index 3ac8f145f87..3ac8f145f87 100644
--- a/sql/updates/8239_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8239_world_spell_proc_event.sql
diff --git a/sql/updates/8241_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8241_world_spell_proc_event.sql
index 9508dfc7f51..9508dfc7f51 100644
--- a/sql/updates/8241_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8241_world_spell_proc_event.sql
diff --git a/sql/updates/8242_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8242_world_spell_proc_event.sql
index 17bf0d57253..17bf0d57253 100644
--- a/sql/updates/8242_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8242_world_spell_proc_event.sql
diff --git a/sql/updates/8244_world_spell_dbc.sql b/sql/updates/3.3.3a_old/8244_world_spell_dbc.sql
index b0b812301c1..b0b812301c1 100644
--- a/sql/updates/8244_world_spell_dbc.sql
+++ b/sql/updates/3.3.3a_old/8244_world_spell_dbc.sql
diff --git a/sql/updates/8246_world_script_texts.sql b/sql/updates/3.3.3a_old/8246_world_script_texts.sql
index 051a7613fc2..051a7613fc2 100644
--- a/sql/updates/8246_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8246_world_script_texts.sql
diff --git a/sql/updates/8246_world_scriptname.sql b/sql/updates/3.3.3a_old/8246_world_scriptname.sql
index fc1f1825c83..fc1f1825c83 100644
--- a/sql/updates/8246_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8246_world_scriptname.sql
diff --git a/sql/updates/8248_world_script_texts.sql b/sql/updates/3.3.3a_old/8248_world_script_texts.sql
index 73524d3d425..73524d3d425 100644
--- a/sql/updates/8248_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8248_world_script_texts.sql
diff --git a/sql/updates/8248_world_scriptname.sql b/sql/updates/3.3.3a_old/8248_world_scriptname.sql
index b844c7aff2e..b844c7aff2e 100644
--- a/sql/updates/8248_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8248_world_scriptname.sql
diff --git a/sql/updates/8255_world_item_template.sql b/sql/updates/3.3.3a_old/8255_world_item_template.sql
index 7fc29b24834..7fc29b24834 100644
--- a/sql/updates/8255_world_item_template.sql
+++ b/sql/updates/3.3.3a_old/8255_world_item_template.sql
diff --git a/sql/updates/8259_world_spell_proc_event.sql b/sql/updates/3.3.3a_old/8259_world_spell_proc_event.sql
index a1b8b3eabb7..a1b8b3eabb7 100644
--- a/sql/updates/8259_world_spell_proc_event.sql
+++ b/sql/updates/3.3.3a_old/8259_world_spell_proc_event.sql
diff --git a/sql/updates/8263_world_script_texts.sql b/sql/updates/3.3.3a_old/8263_world_script_texts.sql
index 3eb5328aff1..3eb5328aff1 100644
--- a/sql/updates/8263_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8263_world_script_texts.sql
diff --git a/sql/updates/8265_world_script_texts.sql b/sql/updates/3.3.3a_old/8265_world_script_texts.sql
index 8f21b86f895..8f21b86f895 100644
--- a/sql/updates/8265_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8265_world_script_texts.sql
diff --git a/sql/updates/8265_world_scriptname.sql b/sql/updates/3.3.3a_old/8265_world_scriptname.sql
index 339365af1e7..339365af1e7 100644
--- a/sql/updates/8265_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8265_world_scriptname.sql
diff --git a/sql/updates/8271_world_spell_dbc.sql b/sql/updates/3.3.3a_old/8271_world_spell_dbc.sql
index f8c6c8c3145..f8c6c8c3145 100644
--- a/sql/updates/8271_world_spell_dbc.sql
+++ b/sql/updates/3.3.3a_old/8271_world_spell_dbc.sql
diff --git a/sql/updates/8277_world_scriptname.sql b/sql/updates/3.3.3a_old/8277_world_scriptname.sql
index a45ac65f297..a45ac65f297 100644
--- a/sql/updates/8277_world_scriptname.sql
+++ b/sql/updates/3.3.3a_old/8277_world_scriptname.sql
diff --git a/sql/updates/8280_world_spell_dbc.sql b/sql/updates/3.3.3a_old/8280_world_spell_dbc.sql
index ccd3da0f8cd..ccd3da0f8cd 100644
--- a/sql/updates/8280_world_spell_dbc.sql
+++ b/sql/updates/3.3.3a_old/8280_world_spell_dbc.sql
diff --git a/sql/updates/8287_world_script_texts.sql b/sql/updates/3.3.3a_old/8287_world_script_texts.sql
index 4d3c5518d6a..4d3c5518d6a 100644
--- a/sql/updates/8287_world_script_texts.sql
+++ b/sql/updates/3.3.3a_old/8287_world_script_texts.sql
diff --git a/sql/updates/8292_world_creature.sql b/sql/updates/3.3.3a_old/8292_world_creature.sql
index fe905274436..fe905274436 100644
--- a/sql/updates/8292_world_creature.sql
+++ b/sql/updates/3.3.3a_old/8292_world_creature.sql
diff --git a/sql/updates/8293_world_spell_dbc.sql b/sql/updates/3.3.3a_old/8293_world_spell_dbc.sql
index 8bfabc46696..8bfabc46696 100644
--- a/sql/updates/8293_world_spell_dbc.sql
+++ b/sql/updates/3.3.3a_old/8293_world_spell_dbc.sql
diff --git a/sql/updates/8300_characters_character_battleground_random.sql b/sql/updates/3.3.3a_old/8300_characters_character_battleground_random.sql
index 780374d50f6..780374d50f6 100644
--- a/sql/updates/8300_characters_character_battleground_random.sql
+++ b/sql/updates/3.3.3a_old/8300_characters_character_battleground_random.sql
diff --git a/sql/updates/8300_characters_worldstates.sql b/sql/updates/3.3.3a_old/8300_characters_worldstates.sql
index 764fadbee71..764fadbee71 100644
--- a/sql/updates/8300_characters_worldstates.sql
+++ b/sql/updates/3.3.3a_old/8300_characters_worldstates.sql
diff --git a/sql/updates/3.3.3a_old/8306_world_scriptname.sql b/sql/updates/3.3.3a_old/8306_world_scriptname.sql
new file mode 100644
index 00000000000..7578cfd60fd
--- /dev/null
+++ b/sql/updates/3.3.3a_old/8306_world_scriptname.sql
@@ -0,0 +1,44 @@
+--
+-- Update basic NPC guards to use a common AI - gossip now handled in database
+--
+-- guard_azuremyst -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (18038);
+-- guard_bluffwatcher -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (3084);
+-- guard_contested -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (3502,4624,9460,11190,15184);
+-- guard_darnassus -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (4262);
+-- guard_dunmorogh -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (727,13076);
+-- guard_durotar -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (5953);
+-- guard_elwynnforest -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (1423);
+-- guard_eversong -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (16221);
+-- guard_exodar -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (16733);
+-- guard_ironforge -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (5595);
+-- guard_mulgore -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (3212,3215,3217,3218,3219,3220,3221,3222,3223,3224);
+-- guard_shattrath -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (19687);
+-- guard_silvermoon -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (16222);
+-- guard_teldrassil -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (3571);
+-- guard_tirisfal -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (1735,1738,1742,1743,1744,1745,1746,2209,2210,5725);
+-- guard_undercity -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (5624);
+--
+-- Update (remove) scripts from NPCs that had gossip - gossip now handled in database (AI removed)
+--
+-- NPC Surristrasz
+UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` IN (24795);
+-- NPC Tiare
+UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` IN (30051);
+-- NPC Fizzcrank Fullthrottle
+UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` IN (25590);
diff --git a/sql/updates/8300_world_battleground_template.sql b/sql/updates/8300_world_battleground_template.sql
deleted file mode 100644
index db32dba1fdf..00000000000
--- a/sql/updates/8300_world_battleground_template.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `battleground_template` SET `MinPlayersPerTeam`='10', `MaxPlayersPerTeam`='10' WHERE `battleground_template`.`id`=32;