diff --git a/data/sql/updates/pending_db_world/rev_1615554422211758800.sql b/data/sql/updates/pending_db_world/rev_1615554422211758800.sql
new file mode 100644
index 000000000..58260864d
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1615554422211758800.sql
@@ -0,0 +1,13 @@
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1615554422211758800');
+
+-- Change Susurrus scripting to SmartAI
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE (`entry` = 17435);
+
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 17435) AND (`source_type` = 0) AND (`id` IN (0));
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(17435, 0, 0, 0, 62, 0, 100, 0, 7415, 0, 0, 0, 0, 11, 32474, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Susurrus - On Gossip Option 0 Selected - Cast \'Buffeting Winds of Susurrus\'');
+
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 15) AND (`SourceGroup` = 7415) AND (`SourceEntry` = 0) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 2) AND (`ConditionTarget` = 0) AND (`ConditionValue1` = 23843) AND (`ConditionValue2` = 1) AND (`ConditionValue3` = 2);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15, 7415, 0, 0, 0, 2, 0, 23843, 1, 2, 0, 0, 0, '', 'Player must have Whorl of Air for this gossip menu option to display');
+
diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
index bdf40e645..d339857a4 100644
--- a/src/server/scripts/World/npc_taxi.cpp
+++ b/src/server/scripts/World/npc_taxi.cpp
@@ -18,7 +18,6 @@ EndScriptData
 #include "ScriptMgr.h"
 #include "WorldSession.h"
 
-#define GOSSIP_SUSURRUS         "I am ready."
 #define GOSSIP_NETHER_DRAKE     "I'm ready to fly! Take me up, dragon!"
 #define GOSSIP_IRONWING         "I'd like to take a flight around Stormwind Harbor."
 #define GOSSIP_DABIREE1         "Fly me to Murketh and Shaadraz Gateways"
@@ -55,10 +54,6 @@ public:
 
         switch (creature->GetEntry())
         {
-            case 17435: // Azuremyst Isle - Susurrus
-                if (player->HasItemCount(23843, 1, true))
-                    AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_SUSURRUS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
-                break;
             case 20903: // Netherstorm - Protectorate Nether Drake
                 if (player->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && player->HasItemCount(29778))
                     AddGossipItemFor(player, GOSSIP_ICON_CHAT, GOSSIP_NETHER_DRAKE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
@@ -150,11 +145,6 @@ public:
         ClearGossipMenuFor(player);
         switch (action)
         {
-            case GOSSIP_ACTION_INFO_DEF:
-                //spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506.
-                CloseGossipMenuFor(player);
-                player->CastSpell(player, 32474, true);
-                break;
             case GOSSIP_ACTION_INFO_DEF + 1:
                 CloseGossipMenuFor(player);
                 player->ActivateTaxiPathTo(627);                  //TaxiPath 627 (possibly 627+628(152->153->154->155))