fix: package.json & package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-EXPRESS-6474509
2026-02-14 18:30:59 +00:00 · 2024-03-27 03:37:30 +00:00
26 changed files with 6239 additions and 4737 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,10 +6,10 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
        with:
-          node-version: 20
+          node-version: 18
      - run: npm ci
      - run: npm run jslint
      - run: docker pull drachtio/sipp
--- a/data/example-voicemail-greetings.json
+++ b/data/example-voicemail-greetings.json
@@ -9,112 +9,7 @@
    "can't take your call",
    "will get back to you",
    "I'll get back to you",
-    "we are unable",
-    "Unable to take your call now",
-    "I'll reply soon",
-    "I'll call back",
-    "I'll reach out to you as soon as possible",
-    "Leave a message",
-    "Away from phone",
-    "Not available now",
-    "I'll return call",
-    "On another call",
-    "Currently on another call",
-    "I will return call later",
-    "Busy please leave message",
-    "Message will be returned promptly",
-    "Currently unavailable to answer",
-    "Planning to return your call soon",
-    "Apologies for missing your call",
-    "Not by the phone at the moment",
-    "Expecting to return your call",
-    "Currently not accessible",
-    "Intend to call back",
-    "Appreciate your patience!",
-    "Engaged in another conversation",
-    "I Will respond promptly",
-    "Kindly leave a message",
-    "Currently occupied leave a message",
-    "Unfortunately unable to answer right now",
-    "Occupied at the moment",
-    "Not present leave a message",
-    "Regrettably unavailable kindly leave a message",
-    "Will ensure a prompt response to your message",
-    "Currently engaged",
-    "Will return your call at the earliest opportunity",
-    "Your message will receive my prompt attention",
-    "I'll respond as soon as I can",
-    "Your message is important please leave it after the beep",
-    "Away from the phone at the moment",
-    "Unable to answer right now",
-    "Engaged in another task",
-    "Not by the phone presently",
-    "I'll respond at my earliest convenience",
-    "Away from the phone momentarily",
-    "I'll return your call shortly",
-    "Currently not able to answer",
-    "Your message is important please leave it after the tone",
-    "I'm unable to take your call right now",
-    "Please leave your message for me",
-    "I'll get back to you soon",
-    "Your call has been missed",
-    "Please leave a detailed message for me to respond to",
-    "Leave a message I'll make sure to respond",
-    "Feel free to leave a message",
-    "Your call is important to me",
-    "I'll get back to you shortly",
-    "Your message will be attended to promptly",
-    "Not available at the moment",
-    "I'll be sure to get back to you",
-    "I'll call you back soon",
-    "I'll ensure a prompt response",
-    "Sorry for the inconvenience",
-    "I'll return your call",
-    "I'll make sure to get back to you",
-    "I'll call you back shortly",
-    "I'll return your call as soon as possible",
-    "Apologies for the inconvenience leave your message",
-    "Your call is appreciated",
-    "I'm unavailable to answer",
-    "I'm currently away",
-    "I'll return your call as soon as I can",
-    "I'm away from the phone",
-    "I'm currently unavailable to take your call",
-    "Sorry for missing your call",
-    "I'll ensure it receives my immediate attention",
-    "I'm away from the phone momentarily",
-    "I'll reach out to you shortly",
-    "Apologies for the inconvenience",
-    "Currently occupied",
-    "Unable to answer your call at the moment",
-    "I'll make sure to follow up with you",
-    "Sorry for not being available",
-    "I'll reach out to you as soon as I can",
-    "I'm currently engaged",
-    "I'm currently busy",
-    "I'm currently unavailable",
-    "I'll respond to you at my earliest convenience",
-    "Your message is appreciated",
-    "I'll get back to you promptly",
-    "I'll get back to you without delay",
-    "Currently away from the phone",
-    "I'll return your call at my earliest opportunity",
-    "Sorry for the missed call",
-    "I'll make sure to address your concerns",
-    "Please provide your details for a callback",
-    "I'll make every effort to respond promptly",
-    "I'll ensure it's attended to promptly",
-    "Away from the phone temporarily",
-    "I'll get back to you as soon as I return",
-    "Currently not in a position to answer your call",
-    "Your call cannot be answered at the moment",
-    "I'll ensure to respond as soon as I'm able",
-    "Your call is important please leave a message",
-    "Unable to answer right now please leave your message",
-    "Currently not accessible intending to return your call",
-    "I'll respond promptly to your message",
-    "leave a memo",
-    "please leave a memo"
+    "we are unable"
  ],
  "es-ES": [
    "le pasamos la llamada",
--- a/lib/dynamic-apps.js
+++ b/lib/dynamic-apps.js
@@ -30,20 +30,6 @@ const appsMap = {
        }
      ]
    }]
-  },
-  conference: {
-    // Dummy hook to follow later feature server logic.
-    call_hook: {
-      url: 'https://jambonz.org',
-      method: 'GET'
-    },
-    account_sid: '',
-    app_json: [{
-      verb: 'conference',
-      name: '',
-      beep: false,
-      startConferenceOnEnter: true
-    }]
  }
 };

@@ -52,7 +38,6 @@ const createJambonzApp = (type, {account_sid, name, caller_id}) => {
  app.account_sid = account_sid;
  switch (type) {
    case 'queue':
-    case 'conference':
      app.app_json[0].name = name;
      break;
    case 'user':
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -75,19 +75,13 @@ module.exports = function(srf, logger) {
      req.locals.application_sid = application_sid;
    }
    // check for call to queue
-    else if (uri.user?.startsWith('queue-') && req.locals.originatingUser && clientDb?.allow_direct_queue_calling) {
+    if (uri.user?.startsWith('queue-') && req.locals.originatingUser && clientDb?.allow_direct_queue_calling) {
      const queue_name = uri.user.match(/queue-(.*)/)[1];
      logger.debug(`got Queue from Request URI header: ${queue_name}`);
      req.locals.queue_name = queue_name;
    }
-    // check for call to conference
-    else if (uri.user?.startsWith('conference-') && req.locals.originatingUser && clientDb?.allow_direct_app_calling) {
-      const conference_id = uri.user.match(/conference-(.*)/)[1];
-      logger.debug(`got Conference from Request URI header: ${conference_id}`);
-      req.locals.conference_id = conference_id;
-    }
    // check for call to registered user
-    else if (!JAMBONES_DISABLE_DIRECT_P2P_CALL && req.locals.originatingUser && clientDb?.allow_direct_user_calling) {
+    if (!JAMBONES_DISABLE_DIRECT_P2P_CALL && req.locals.originatingUser && clientDb?.allow_direct_user_calling) {
      const arr = /^(.*)@(.*)/.exec(req.locals.originatingUser);
      if (arr) {
        const sipRealm = arr[2];
@@ -243,9 +237,6 @@ module.exports = function(srf, logger) {
        logger.debug(`calling to registered user ${req.locals.called_user}, generating dial app`);
        app = createJambonzApp('user',
          {account_sid, name: req.locals.called_user, caller_id: req.locals.callingNumber});
-      } else if (req.locals.conference_id) {
-        logger.debug(`calling to conference ${req.locals.conference_id}, generating conference app`);
-        app = createJambonzApp('conference', {account_sid, name: req.locals.conference_id});
      } else if (req.locals.application_sid) {
        app = await lookupAppBySid(req.locals.application_sid);
      } else if (req.locals.originatingUser) {
--- a/lib/session/call-session.js
+++ b/lib/session/call-session.js
@@ -112,19 +112,13 @@ class CallSession extends Emitter {
      this.requestor.removeAllListeners();
      this.application.requestor = newRequestor;
      this.requestor.on('command', this._onCommand.bind(this));
-      this.logger.debug(`CallSession: ${this.callSid} listener count ${this.requestor.listenerCount('command')}`);
      this.requestor.on('connection-dropped', this._onWsConnectionDropped.bind(this));
      this.requestor.on('handover', handover.bind(this));
-      this.requestor.on('reconnect-error', this._onSessionReconnectError.bind(this));
    };

-    if (!this.isConfirmCallSession) {
-      this.requestor.on('command', this._onCommand.bind(this));
-      this.logger.debug(`CallSession: ${this.callSid} listener count ${this.requestor.listenerCount('command')}`);
-      this.requestor.on('connection-dropped', this._onWsConnectionDropped.bind(this));
-      this.requestor.on('handover', handover.bind(this));
-      this.requestor.on('reconnect-error', this._onSessionReconnectError.bind(this));
-    }
+    this.requestor.on('command', this._onCommand.bind(this));
+    this.requestor.on('connection-dropped', this._onWsConnectionDropped.bind(this));
+    this.requestor.on('handover', handover.bind(this));
  }

  /**
@@ -195,24 +189,6 @@ class CallSession extends Emitter {
    this._synthesizer = synth;
  }

-  /**
-   * ASR TTS fallback
-   */
-  get hasFallbackAsr() {
-    return this._hasFallbackAsr || false;
-  }
-
-  set hasFallbackAsr(i) {
-    this._hasFallbackAsr = i;
-  }
-
-  get hasFallbackTts() {
-    return this._hasFallbackTts || false;
-  }
-
-  set hasFallbackTts(i) {
-    this._hasFallbackTts = i;
-  }
  /**
   * default vendor to use for speech synthesis if not provided in the app
   */
@@ -338,17 +314,6 @@ class CallSession extends Emitter {
    this.application.fallback_speech_recognizer_language = language;
  }

-  /**
-   * Vad
-   */
-  get vad() {
-    return this._vad;
-  }
-
-  set vad(v) {
-    this._vad = v;
-  }
-
  /**
   * indicates whether the call currently in progress
   */
@@ -526,14 +491,6 @@ class CallSession extends Emitter {
  set actionHookDelayActions(e) {
    this._actionHookDelayActions = e;
  }
-  // Getter/setter for current tts vendor
-  get currentTtsVendor() {
-    return this._currentTtsVendor;
-  }
-
-  set currentTtsVendor(vendor) {
-    this._currentTtsVendor = vendor;
-  }

  hasGlobalSttPunctuation() {
    return this._globalSttPunctuation !== undefined;
@@ -741,7 +698,7 @@ class CallSession extends Emitter {
      task = await this.backgroundTaskManager.newTask('bargeIn', gather);
      task.sticky = autoEnable;
      // listen to the bargein-done from background manager
-      this.backgroundTaskManager.on('bargeIn-done', () => {
+      this.backgroundTaskManager.once('bargeIn-done', () => {
        if (this.requestor instanceof WsRequestor) {
          try {
            this.kill(true);
@@ -823,7 +780,6 @@ class CallSession extends Emitter {
            speech_credential_sid: credential.speech_credential_sid,
            accessKeyId: credential.access_key_id,
            secretAccessKey: credential.secret_access_key,
-            roleArn: credential.role_arn,
            region: credential.aws_region || AWS_REGION
          };
        }
@@ -895,19 +851,6 @@ class CallSession extends Emitter {
            model_id: credential.model_id,
            options: credential.options
          };
-        } else if ('playht' === vendor) {
-          return {
-            api_key: credential.api_key,
-            user_id: credential.user_id,
-            voice_engine: credential.voice_engine,
-            options: credential.options
-          };
-        } else if ('rimelabs' === vendor) {
-          return {
-            api_key: credential.api_key,
-            model_id: credential.model_id,
-            options: credential.options
-          };
        } else if ('assemblyai' === vendor) {
          return {
            speech_credential_sid: credential.speech_credential_sid,
@@ -918,12 +861,6 @@ class CallSession extends Emitter {
            api_key: credential.api_key,
            model_id: credential.model_id
          };
-        }  else if ('verbio' === vendor) {
-          return {
-            client_id: credential.client_id,
-            client_secret: credential.client_secret,
-            engine_version: credential.engine_version
-          };
        } else if (vendor.startsWith('custom:')) {
          return {
            speech_credential_sid: credential.speech_credential_sid,
@@ -1007,11 +944,6 @@ class CallSession extends Emitter {
      ) {
        try {
          await this._awaitCommandsOrHangup();
-          if (this._isPlayingFillerNoise) {
-            this._isPlayingFillerNoise = false;
-            this.ep.api('uuid_break', this.ep.uuid)
-              .catch((err) => this.logger.info(err, 'Error killing filler noise'));
-          }
          if (this.callGone) break;
        } catch (err) {
          this.logger.info(err, 'CallSession:exec - error waiting for new commands');
@@ -1298,7 +1230,7 @@ class CallSession extends Emitter {
  async _lccConferenceParticipantAction(opts) {
    const task = this.currentTask;
    if (!task || TaskName.Conference !== task.name || !this.isInConference) {
-      return this.logger.info('CallSession:_lccConferenceParticipantAction - invalid cmd, call is not in conference');
+      return this.logger.info('CallSession:_lccConferenceParticipantState - invalid cmd, call is not in conference');
    }
    task.doConferenceParticipantAction(this, opts);
  }
@@ -1435,30 +1367,6 @@ Duration=${duration} `
    task.whisper(tasks, callSid).catch((err) => this.logger.error(err, 'CallSession:_lccWhisper'));
  }

-  async _lccConfig(opts) {
-    this.logger.debug({opts}, 'CallSession:_lccConfig');
-    const t = normalizeJambones(this.logger, [
-      {
-        verb: 'config',
-        ...opts
-      }
-    ])
-      .map((tdata) => makeTask(this.logger, tdata));
-
-    const task = t[0];
-
-    const {span, ctx} = this.rootSpan.startChildSpan(`verb:${task.summary}`);
-    span.setAttributes({'verb.summary': task.summary});
-    task.span = span;
-    task.ctx = ctx;
-    try {
-      await task.exec(this, {ep: this.ep});
-    } catch (err) {
-      this.logger.error(err, 'CallSession:_lccConfig');
-    }
-    task.span.end();
-  }
-
  async _lccDub(opts, callSid) {
    this.logger.debug({opts}, `CallSession:_lccDub on call_sid ${callSid}`);
    const t = normalizeJambones(this.logger, [
@@ -1469,24 +1377,23 @@ Duration=${duration} `
    ])
      .map((tdata) => makeTask(this.logger, tdata));

-    const task = t[0];
+    const dubTask = t[0];
    const ep = this.currentTask?.name === TaskName.Dial && callSid === this.currentTask?.callSid ?
      this.currentTask.ep :
      this.ep;

-    const {span, ctx} = this.rootSpan.startChildSpan(`verb:${task.summary}`);
-    span.setAttributes({'verb.summary': task.summary});
-    task.span = span;
-    task.ctx = ctx;
+    const {span, ctx} = this.rootSpan.startChildSpan(`verb:${dubTask.summary}`);
+    span.setAttributes({'verb.summary': dubTask.summary});
+    dubTask.span = span;
+    dubTask.ctx = ctx;
    try {
-      await task.exec(this, {ep});
+      await dubTask.exec(this, {ep});
    } catch (err) {
      this.logger.error(err, 'CallSession:_lccDub');
    }
-    task.span.end();
+    dubTask.span.end();
  }

-
  async _lccBoostAudioSignal(opts, callSid) {
    const ep = this.currentTask?.name === TaskName.Dial && callSid === this.currentTask?.callSid ?
      this.currentTask.ep :
@@ -1550,7 +1457,7 @@ Duration=${duration} `
      return this._lccTag(opts);
    }
    else if (opts.conferenceParticipantAction) {
-      return this._lccConferenceParticipantAction(opts.conferenceParticipantAction);
+      return this._lccConferenceParticipantState(opts);
    }
    else if (opts.dub) {
      return this._lccDub(opts);
@@ -1649,23 +1556,7 @@ Duration=${duration} `
  }

  _preCacheAudio(newTasks) {
-    /**
-     * only precache audio for the a queued say if we have one or more non-Config verbs
-     * ahead of it in the queue.  This is because the Config verb returns immediately
-     * and would not give us enough time to generate the audio.  The point of precaching
-     * is to take advantage of getting the audio in advance of being needed, so we need
-     * to be confident we have some time before the say verb is executed, and the Config
-     * does not give us that confidence since it returns immediately.
-     */
-    const haveQueuedNonConfig = this.tasks.findIndex((t) => t.name !== TaskName.Config) !== -1;
-    let tasks = haveQueuedNonConfig ? newTasks : [];
-    if (!haveQueuedNonConfig) {
-      const idxFirstNotConfig = newTasks.findIndex((t) => t.name !== TaskName.Config);
-      if (-1 === idxFirstNotConfig) return;
-      tasks = newTasks.slice(idxFirstNotConfig + 1);
-    }
-
-    for (const task of tasks) {
+    for (const task of newTasks) {
      if (task.name === TaskName.Config && task.hasSynthesizer) {
        /* if they change synthesizer settings don't try to precache */
        break;
@@ -1737,22 +1628,6 @@ Duration=${duration} `
    }, 'CallSession:_injectTasks - completed');
  }

-  async _onSessionReconnectError(err) {
-    const {writeAlerts, AlertType} = this.srf.locals;
-    const sid = this.accountInfo.account.account_sid;
-    this.logger.info({err}, `_onSessionReconnectError for account ${sid}`);
-    try {
-      await writeAlerts({
-        alert_type: AlertType.WEBHOOK_CONNECTION_FAILURE,
-        account_sid: this.accountSid,
-        detail: `Session:reconnect error ${err}`
-      });
-    } catch (error) {
-      this.logger.error({error}, 'Error writing WEBHOOK_CONNECTION_FAILURE alert');
-    }
-    this._jambonzHangup();
-  }
-
  _onCommand({msgid, command, call_sid, queueCommand, data}) {
    this.logger.info({msgid, command, queueCommand, data}, 'CallSession:_onCommand - received command');
    let resolution;
@@ -1789,10 +1664,6 @@ Duration=${duration} `
        this._lccCallStatus(data);
        break;

-      case 'config':
-        this._lccConfig(data, call_sid);
-        break;
-
      case 'dial':
        this._lccCallDial(data);
        break;
@@ -1933,7 +1804,7 @@ Duration=${duration} `
      });
      //ep.cs = this;
      this.ep = ep;
-      this.logger.info(`allocated endpoint ${ep.uuid}`);
+      this.logger.debug(`allocated endpoint ${ep.uuid}`);

      this._configMsEndpoint();

@@ -2047,7 +1918,6 @@ Duration=${duration} `
  /**
   * called when the caller has hung up.  Provided for subclasses to override
   * in order to apply logic at this point if needed.
-   * return true if success fallback, return false if not
   */
  _callerHungup() {
    assert(false, 'subclass responsibility to override this method');
@@ -2108,10 +1978,6 @@ Duration=${duration} `
      }
      this.logger.debug(`CallSession:propagateAnswer - answered callSid ${this.callSid}`);
    }
-    else {
-      this.logger.debug('CallSession:propagateAnswer - call already answered - re-anchor media with a reinvite');
-      await this.dlg.modify(this.ep.local.sdp);
-    }
  }

  async _onRequestWithinDialog(req, res) {
@@ -2449,20 +2315,6 @@ Duration=${duration} `
    return new Promise((resolve, reject) => {
      this.logger.info('_awaitCommandsOrHangup - waiting...');
      this.wakeupResolver = resolve;
-
-      /* start filler noise if configured while we wait for new commands */
-      if (this.fillerNoise?.url && this.ep?.connected && !this.ep2) {
-        this.logger.debug('CallSession:_awaitCommandsOrHangup - playing filler noise');
-        this._isPlayingFillerNoise = true;
-        this.ep.play(this.fillerNoise.url);
-        this.ep.once('playback-start', (evt) => {
-          if (evt.file === this.fillerNoise.url && !this._isPlayingFillerNoise) {
-            this.logger.info('CallSession:_awaitCommandsOrHangup - filler noise started');
-            this.ep.api('uuid_break', this.ep.uuid)
-              .catch((err) => this.logger.info(err, 'Error killing filler noise'));
-          }
-        });
-      }
    });
  }

@@ -2503,7 +2355,6 @@ Duration=${duration} `

  _startActionHookNoResponseTimer(options) {
    this._clearActionHookNoResponseTimer();
-    this._actionHookDelayResolved = false;
    if (options.noResponseTimeoutMs) {
      this.logger.debug(`CallSession:_startActionHookNoResponseTimer ${options.noResponseTimeoutMs}`);
      this._actionHookNoResponseTimer = setTimeout(() => {
@@ -2517,9 +2368,7 @@ Duration=${duration} `
        if (t.length) {
          t[0].on('playDone', (err) => {
            if (err) this.logger.error({err}, `Call-Session:exec Error delay action, play ${verb}`);
-            if (!this._actionHookDelayResolved) {
-              this._startActionHookNoResponseTimer(options);
-            }
+            this._startActionHookNoResponseTimer(options);
          });
        }
        this.tasks.push(...t);
@@ -2537,16 +2386,7 @@ Duration=${duration} `

  _clearActionHookNoResponseTimer() {
    if (this._actionHookNoResponseTimer) {
-      // Action Hook delay is solved.
-      this._actionHookDelayResolved = true;
      clearTimeout(this._actionHookNoResponseTimer);
-      // if delay action is enabled
-      // and bot has responded with list of new verbs
-      // Only kill current running play task.
-      //https://github.com/jambonz/jambonz-feature-server/issues/710
-      if (this.currentTask?.name === TaskName.Play) {
-        this.currentTask.kill(this);
-      }
    }
    this._actionHookNoResponseTimer = null;
  }
--- a/lib/session/inbound-call-session.js
+++ b/lib/session/inbound-call-session.js
@@ -79,7 +79,6 @@ class InboundCallSession extends CallSession {
      this.logger.info('InboundCallSession:_hangup - race condition, dlg cleared by app hangup');
      return;
    }
-    this.logger.info(`InboundCallSession: ${terminatedBy} hung up`);
    assert(this.dlg.connectTime);
    const duration = moment().diff(this.dlg.connectTime, 'seconds');
    this.rootSpan.setAttributes({'call.termination': `hangup by ${terminatedBy}`});
@@ -88,6 +87,7 @@ class InboundCallSession extends CallSession {
      callStatus: CallStatus.Completed,
      duration
    });
+    this.logger.info(`InboundCallSession: ${terminatedBy} hung up`);
    this._callReleased();
    this.req.removeAllListeners('cancel');
  }
--- a/lib/tasks/conference.js
+++ b/lib/tasks/conference.js
@@ -60,8 +60,6 @@ class Conference extends Task {

    this.emitter = new Emitter();
    this.results = {};
-    this.coaching = [];
-    this.speakOnlyTo = this.data.speakOnlyTo;

    // transferred from another server in order to bridge to a local caller?
    if (this.data._ && this.data._.connectTime) {
@@ -350,7 +348,7 @@ class Conference extends Task {
      Object.assign(opts, {flags: {
        ...(this.endConferenceOnExit && {endconf: true}),
        ...(this.startConferenceOnEnter && {moderator: true}),
-        ...((this.joinMuted || this.speakOnlyTo) && {joinMuted: true}),
+        ...((this.joinMuted || this.data.speakOnlyTo) && {joinMuted: true}),
      }});

      /**
@@ -363,7 +361,7 @@ class Conference extends Task {
    try {
      const {memberId, confUuid} = await this.ep.join(this.confName, opts);
      this.logger.debug({memberId, confUuid}, `Conference:_joinConference: successfully joined ${this.confName}`);
-      this.memberId = parseInt(memberId, 10);
+      this.memberId = memberId;
      this.confUuid = confUuid;

      // set a tag for this member, if provided
@@ -397,8 +395,8 @@ class Conference extends Task {
          .catch((err) => {});
      }

-      if (this.speakOnlyTo) {
-        this.setCoachMode(this.speakOnlyTo);
+      if (this.data.speakOnlyTo) {
+        this.setCoachMode(this.data.speakOnlyTo);
      }
    } catch (err) {
      this.logger.error(err, `Failed to join conference ${this.confName}`);
@@ -518,7 +516,7 @@ class Conference extends Task {
        this.doConferenceMute(cs, {conf_mute_status: 'unmute'});
        break;
      default:
-        this.logger.info(`Conference:doConferenceParticipantAction - unhandled action ${action}`);
+        this.logger.info(`Conference:doConferenceParticipantState - unhandled action ${action}`);
        break;
    }
  }
@@ -588,7 +586,7 @@ class Conference extends Task {
      const response = await this.ep.api('conference', [this.confName, 'get', 'count']);
      if (response.body && confNoMatch(response.body)) this.participantCount = 0;
      else if (response.body && /^\d+$/.test(response.body)) this.participantCount = parseInt(response.body) - 1;
-      this.logger.debug(`Conference:_doFinalMemberCheck conference count ${this.participantCount}`);
+      this.logger.debug({response}, `Conference:_doFinalMemberCheck conference count ${this.participantCount}`);
    } catch (err) {
      this.logger.info({err}, 'Conference:_doFinalMemberCheck error retrieving count (we were probably kicked');
    }
@@ -701,12 +699,7 @@ class Conference extends Task {

  // conference event handlers
  _onAddMember(logger, cs, evt) {
-    const memberId = parseInt(evt.getHeader('Member-ID')) ;
-    if (this.speakOnlyTo) {
-      logger.debug(`Conference:_onAddMember - member ${memberId} added to ${this.confName}, updating coaching mode`);
-      this.setCoachMode(this.speakOnlyTo).catch(() => {});
-    }
-    else logger.debug(`Conference:_onAddMember - member ${memberId} added to conference ${this.confName}`);
+    logger.debug({evt}, `Conference:_onAddMember - member added to conference ${this.confName}`);
  }
  _onDelMember(logger, cs, evt) {
    const memberId = parseInt(evt.getHeader('Member-ID')) ;
@@ -741,64 +734,28 @@ class Conference extends Task {
    }
  }

-  _onTag(logger, cs, evt) {
-    const memberId = parseInt(evt.getHeader('Member-ID')) ;
-    const tag = evt.getHeader('Tag') || '';
-    if (memberId !== this.memberId && this.speakOnlyTo) {
-      logger.info(`Conference:_onTag - member ${memberId} set tag to '${tag }'; updating coach mode accordingly`);
-      this.setCoachMode(this.speakOnlyTo).catch(() => {});
-    }
-  }
-
-  /**
-   * Set the conference to "coaching" mode, where the audio of the participant is only heard
-   * by a subset of the participants in the conference.
-   * We do this by first getting all of the members who do *not* have this tag, and then
-   * we configure this members audio to not be sent to them.
-   * @param {string} speakOnlyTo - tag of the members who should receive our audio
-   *
-   * N.B.: this feature requires jambonz patches to freeswitch mod_conference
-   */
  async setCoachMode(speakOnlyTo) {
-    this.speakOnlyTo = speakOnlyTo;
-    if (!this.memberId) {
-      this.logger.info('Conference:_setCoachMode: no member id yet');
-      return;
-    }
    try {
-      const members = (await this.ep.getNonMatchingConfParticipants(this.confName, speakOnlyTo))
-        .filter((m) => m !== this.memberId);
-      if (members.length === 0) {
-        this.logger.info({members}, 'Conference:_setCoachMode: all participants have the tag, so all will hear me');
-        if (this.coaching.length) {
-          await this.ep.api('conference', [this.confName, 'relate', this.memberId, this.coaching.join(','), 'clear']);
-          this.coaching = [];
-        }
-      }
-      else {
-        const memberList = members.join(',');
-        this.logger.info(`Conference:_setCoachMode: my audio will NOT be sent to ${memberList}`);
-        await this.ep.api('conference', [this.confName, 'relate', this.memberId, memberList, 'nospeak']);
-        this.coaching = members;
-      }
+      const response = await this.ep.api('conference', [this.confName, 'gettag', speakOnlyTo, 'nomatch']);
+      this.logger.info(`Conference:_setCoachMode: my audio will only be sent to particpants ${response}`);
+      await this.ep.api('conference', [this.confName, 'relate', this.memberId, response, 'nospeak']);
+      this.speakOnlyTo = speakOnlyTo;
+      this.coaching = response;
    } catch (err) {
      this.logger.error({err, speakOnlyTo}, '_setCoachMode: Error');
    }
  }

  async clearCoachMode() {
-    if (!this.memberId) return;
    try {
-      if (this.coaching.length === 0) {
+      if (!this.coaching) {
        this.logger.info('Conference:_clearCoachMode: no coaching mode to clear');
+        return;
      }
-      else {
-        const memberList = this.coaching.join(',');
-        this.logger.info(`Conference:_clearCoachMode: now sending my audio to all, including ${memberList}`);
-        await this.ep.api('conference', [this.confName, 'relate', this.memberId, memberList, 'clear']);
-      }
+      this.logger.info(`Conference:_clearCoachMode: now sending my audio to all, including ${this.coaching}`);
+      await this.ep.api('conference', [this.confName, 'relate', this.memberId, this.coaching, 'clear']);
      this.speakOnlyTo = null;
-      this.coaching = [];
+      this.coaching = null;
    } catch (err) {
      this.logger.error({err}, '_clearCoachMode: Error');
    }
--- a/lib/tasks/config.js
+++ b/lib/tasks/config.js
@@ -15,8 +15,7 @@ class TaskConfig extends Task {
      'transcribe',
      'fillerNoise',
      'actionHookDelayAction',
-      'boostAudioSignal',
-      'vad'
+      'boostAudioSignal'
    ].forEach((k) => this[k] = this.data[k] || {});

    if ('notifyEvents' in this.data) {
@@ -71,7 +70,6 @@ class TaskConfig extends Task {
  get hasListen() { return Object.keys(this.listen).length; }
  get hasTranscribe() { return Object.keys(this.transcribe).length; }
  get hasDub() { return Object.keys(this.dub).length; }
-  get hasVad() { return Object.keys(this.vad).length; }
  get hasFillerNoise() { return Object.keys(this.fillerNoise).length; }

  get summary() {
@@ -261,7 +259,8 @@ class TaskConfig extends Task {
        cs.stopBackgroundTask('transcribe');
      }
    }
-    if (Object.keys(this.actionHookDelayAction).length !== 0) {
+
+    if (this.actionHookDelayAction) {
      cs.actionHookDelayEnabled = this.actionHookDelayAction.enabled || false;
      cs.actionHookNoResponseTimeout = this.actionHookDelayAction.noResponseTimeout || 0;
      cs.actionHookNoResponseGiveUpTimeout = this.actionHookDelayAction.noResponseGiveUpTimeout || 0;
@@ -289,16 +288,6 @@ class TaskConfig extends Task {
        cs.enableFillerNoise(opts);
      }
    }
-
-    if (this.hasVad) {
-      cs.vad = {
-        enable: this.vad.enable || false,
-        voiceMs: this.vad.voiceMs || 250,
-        silenceMs: this.vad.silenceMs || 150,
-        strategy: this.vad.strategy || 'one-shot',
-        mode: this.vad.mod || 2
-      };
-    }
  }

  async kill(cs) {
--- a/lib/tasks/dial.js
+++ b/lib/tasks/dial.js
@@ -636,8 +636,6 @@ class TaskDial extends Task {
              await this._connectSingleDial(cs, sd);
            } catch (err) {
              this.logger.info({err}, 'Dial:_attemptCalls - Error calling _connectSingleDial ');
-              sd.removeAllListeners();
-              this.kill(cs);
            }
          })
          .on('decline', () => {
--- a/lib/tasks/dub.js
+++ b/lib/tasks/dub.js
@@ -125,12 +125,10 @@ class TaskDub extends TtsTask {
    const path = filepath[0];
    if (!path.startsWith('say:{')) {
      /* we have a local file of mp3 or r8 of synthesized speech audio to play */
-      this.logger.info(`playing synthesized speech from file on track ${this.track}: ${path}`);
      this.play = path;
      await this._playOnTrack(cs, ep);
    }
    else {
-      this.logger.info(`doing actual text to speech file on track ${this.track}: ${path}`);
      await ep.dub({
        action: 'sayOnTrack',
        track: this.track,
--- a/lib/tasks/enqueue.js
+++ b/lib/tasks/enqueue.js
@@ -338,7 +338,6 @@ class TaskEnqueue extends Task {
      this.logger.error({err}, `TaskEnqueue:_playHook error retrieving list info for queue ${this.queueName}`);
    }
    const json = await cs.application.requestor.request('verb:hook', hook, params, httpHeaders);
-    this.logger.debug({json}, 'TaskEnqueue:_playHook: received response from waitHook');
    const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));

    const allowedTasks = tasks.filter((t) => allowed.includes(t.name));
--- a/lib/tasks/gather.js
+++ b/lib/tasks/gather.js
@@ -10,9 +10,7 @@ const {
  IbmTranscriptionEvents,
  NvidiaTranscriptionEvents,
  JambonzTranscriptionEvents,
-  AssemblyAiTranscriptionEvents,
-  VadDetection,
-  VerbioTranscriptionEvents
+  AssemblyAiTranscriptionEvents
 } = require('../utils/constants.json');
 const {
  JAMBONES_GATHER_EARLY_HINTS_MATCH,
@@ -29,7 +27,7 @@ class TaskGather extends SttTask {
    [
      'finishOnKey', 'input', 'numDigits', 'minDigits', 'maxDigits',
      'interDigitTimeout', 'partialResultHook', 'bargein', 'dtmfBargein',
-      'speechTimeout', 'timeout', 'say', 'play', 'actionHookDelayAction', 'fillerNoise', 'vad'
+      'speechTimeout', 'timeout', 'say', 'play', 'actionHookDelayAction', 'fillerNoise'
    ].forEach((k) => this[k] = this.data[k]);

    // gather default input is digits
@@ -43,8 +41,7 @@ class TaskGather extends SttTask {
    this.timeout = this.timeout === 0 ? 0 : (this.timeout || 15) * 1000;
    this.interim = !!this.partialResultHook || this.bargein || (this.timeout > 0);
    this.listenDuringPrompt = this.data.listenDuringPrompt === false ? false : true;
-    this.minBargeinWordCount = this.data.minBargeinWordCount !== undefined ? this.data.minBargeinWordCount : 1;
-    this._vadEnabled = this.minBargeinWordCount === 0;
+    this.minBargeinWordCount = this.data.minBargeinWordCount || 1;
    if (this.data.recognizer) {
      /* continuous ASR (i.e. compile transcripts until a special timeout or dtmf key) */
      this.asrTimeout = typeof this.data.recognizer.asrTimeout === 'number' ?
@@ -131,11 +128,6 @@ class TaskGather extends SttTask {
      ...(this.fillerNoise || {})
    };

-    this.vad = {
-      ...(cs.vad || {}),
-      ...(this.vad || {})
-    };
-
    if (cs.hasGlobalSttHints && !this.maskGlobalSttHints) {
      const {hints, hintsBoost} = cs.globalSttHints;
      const setOfHints = new Set((this.data.recognizer.hints || [])
@@ -186,8 +178,6 @@ class TaskGather extends SttTask {
      retries: this._hookDelayRetries
    };

-    this._startVad();
-
    const startListening = async(cs, ep) => {
      this._startTimer();
      if (this.isContinuousAsr && 0 === this.timeout) this._startAsrTimer();
@@ -201,7 +191,12 @@ class TaskGather extends SttTask {
          this._startTranscribing(ep);
          return updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
        } catch (e) {
-          await this._startFallback(cs, ep, {error: e});
+          if (this.fallbackVendor && this.isHandledByPrimaryProvider) {
+            await this._fallback();
+            startListening(cs, ep);
+          } else {
+            this.logger.error({error: e}, 'error in initSpeech');
+          }
        }
      }
    };
@@ -209,9 +204,13 @@ class TaskGather extends SttTask {
    try {
      if (this.sayTask) {
        const {span, ctx} = this.startChildSpan(`nested:${this.sayTask.summary}`);
-        const process = () => {
+        this.sayTask.span = span;
+        this.sayTask.ctx = ctx;
+        this.sayTask.exec(cs, {ep});  // kicked off, _not_ waiting for it to complete
+        this.sayTask.on('playDone', (err) => {
+          span.end();
+          if (err) this.logger.error({err}, 'Gather:exec Error playing tts');
          this.logger.debug('Gather: nested say task completed');
-          this._stopVad();
          if (!this.killed) {
            startListening(cs, ep);
            if (this.input.includes('speech') && this.vendor === 'nuance' && this.listenDuringPrompt) {
@@ -221,24 +220,17 @@ class TaskGather extends SttTask {
              });
            }
          }
-        };
-        this.sayTask.span = span;
-        this.sayTask.ctx = ctx;
-        this.sayTask.exec(cs, {ep})  // kicked off, _not_ waiting for it to complete
-          .catch((err) => {
-            process();
-          });
-        this.sayTask.on('playDone', (err) => {
-          span.end();
-          if (err) this.logger.error({err}, 'Gather:exec Error playing tts');
-          process();
        });
      }
      else if (this.playTask) {
        const {span, ctx} = this.startChildSpan(`nested:${this.playTask.summary}`);
-        const process = () => {
+        this.playTask.span = span;
+        this.playTask.ctx = ctx;
+        this.playTask.exec(cs, {ep});  // kicked off, _not_ waiting for it to complete
+        this.playTask.on('playDone', (err) => {
+          span.end();
+          if (err) this.logger.error({err}, 'Gather:exec Error playing url');
          this.logger.debug('Gather: nested play task completed');
-          this._stopVad();
          if (!this.killed) {
            startListening(cs, ep);
            if (this.input.includes('speech') && this.vendor === 'nuance' && this.listenDuringPrompt) {
@@ -248,17 +240,6 @@ class TaskGather extends SttTask {
              });
            }
          }
-        };
-        this.playTask.span = span;
-        this.playTask.ctx = ctx;
-        this.playTask.exec(cs, {ep})  // kicked off, _not_ waiting for it to complete
-          .catch((err) => {
-            process();
-          });
-        this.playTask.on('playDone', (err) => {
-          span.end();
-          if (err) this.logger.error({err}, 'Gather:exec Error playing url');
-          process();
        });
      }
      else {
@@ -271,14 +252,9 @@ class TaskGather extends SttTask {

      if (this.input.includes('speech') && this.listenDuringPrompt) {
        await this._setSpeechHandlers(cs, ep);
-        if (!this.resolved && !this.killed) {
-          this._startTranscribing(ep);
-          updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
-            .catch(() => {/*already logged error */});
-        }
-        else {
-          this.logger.info('Gather:exec - task was killed or resolved quickly, not starting transcription');
-        }
+        this._startTranscribing(ep);
+        updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
+          .catch(() => {/*already logged error */});
      }

      if (this.input.includes('digits') || this.dtmfBargein || this.asrDtmfTerminationDigit) {
@@ -286,7 +262,6 @@ class TaskGather extends SttTask {
      }

      await this.awaitTaskDone();
-      this._killAudio(cs);
    } catch (err) {
      this.logger.error(err, 'TaskGather:exec error');
    }
@@ -303,7 +278,6 @@ class TaskGather extends SttTask {
    this._clearAsrTimer();
    this.playTask?.span.end();
    this.sayTask?.span.end();
-    this._stopVad();
    this._resolve('killed');
  }

@@ -381,19 +355,23 @@ class TaskGather extends SttTask {
          ep, GoogleTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
        this.addCustomEventListener(
          ep, GoogleTranscriptionEvents.EndOfUtterance, this._onEndOfUtterance.bind(this, cs, ep));
+        this.addCustomEventListener(
+          ep, GoogleTranscriptionEvents.VadDetected, this._onVadDetected.bind(this, cs, ep));
        break;

      case 'aws':
      case 'polly':
        this.bugname = `${this.bugname_prefix}aws_transcribe`;
        this.addCustomEventListener(ep, AwsTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
+        this.addCustomEventListener(ep, AwsTranscriptionEvents.VadDetected, this._onVadDetected.bind(this, cs, ep));
        break;
      case 'microsoft':
        this.bugname = `${this.bugname_prefix}azure_transcribe`;
        this.addCustomEventListener(
          ep, AzureTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-        //this.addCustomEventListener(ep, AzureTranscriptionEvents.NoSpeechDetected,
-        //this._onNoSpeechDetected.bind(this, cs, ep));
+        this.addCustomEventListener(ep, AzureTranscriptionEvents.NoSpeechDetected,
+          this._onNoSpeechDetected.bind(this, cs, ep));
+        this.addCustomEventListener(ep, AzureTranscriptionEvents.VadDetected, this._onVadDetected.bind(this, cs, ep));
        break;
      case 'nuance':
        this.bugname = `${this.bugname_prefix}nuance_transcribe`;
@@ -403,6 +381,8 @@ class TaskGather extends SttTask {
          this._onStartOfSpeech.bind(this, cs, ep));
        this.addCustomEventListener(ep, NuanceTranscriptionEvents.TranscriptionComplete,
          this._onTranscriptionComplete.bind(this, cs, ep));
+        this.addCustomEventListener(ep, NuanceTranscriptionEvents.VadDetected,
+          this._onVadDetected.bind(this, cs, ep));

        /* stall timers until prompt finishes playing */
        if ((this.sayTask || this.playTask) && this.listenDuringPrompt) {
@@ -425,12 +405,6 @@ class TaskGather extends SttTask {
          ep, SonioxTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
        break;

-      case 'verbio':
-        this.bugname = `${this.bugname_prefix}verbio_transcribe`;
-        this.addCustomEventListener(
-          ep, VerbioTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-        break;
-
      case 'cobalt':
        this.bugname = `${this.bugname_prefix}cobalt_transcribe`;
        this.addCustomEventListener(
@@ -478,6 +452,8 @@ class TaskGather extends SttTask {
          this._onStartOfSpeech.bind(this, cs, ep));
        this.addCustomEventListener(ep, NvidiaTranscriptionEvents.TranscriptionComplete,
          this._onTranscriptionComplete.bind(this, cs, ep));
+        this.addCustomEventListener(ep, NvidiaTranscriptionEvents.VadDetected,
+          this._onVadDetected.bind(this, cs, ep));

        /* I think nvidia has this (??) - stall timers until prompt finishes playing */
        if ((this.sayTask || this.playTask) && this.listenDuringPrompt) {
@@ -608,6 +584,7 @@ class TaskGather extends SttTask {
  }

  _killActionHookDelayAction() {
+    this.logger.debug('_killActionHookDelayAction');
    if (this._actionHookDelaySayTask && !this._actionHookDelaySayTask.killed) {
      this._actionHookDelaySayTask.removeAllListeners('playDone');
      this._actionHookDelaySayTask.kill(this.cs);
@@ -715,44 +692,11 @@ class TaskGather extends SttTask {
    this._finalAsrTimer = null;
  }

-
-  _startVad() {
-    if (!this._vadStarted && this._vadEnabled) {
-      this.logger.debug('_startVad');
-      this.addCustomEventListener(this.ep, VadDetection.Detection, this._onVadDetected.bind(this, this.cs, this.ep));
-      this.ep?.startVadDetection(this.vad);
-      this._vadStarted = true;
-    }
-  }
-
-  _stopVad() {
-    if (this._vadStarted) {
-      this.logger.debug('_stopVad');
-      this.ep?.stopVadDetection(this.vad);
-      this.ep?.removeCustomEventListener(VadDetection.Detection, this._onVadDetected);
-      this._vadStarted = false;
-    }
-  }
-
-  _startFillerNoise() {
-    this.logger.debug('Gather:_startFillerNoise - playing filler noise');
-    this.ep?.play(this.fillerNoise.url);
-    this._fillerNoiseOn = true;
-    this.ep.once('playback-start', (evt) => {
-      if (evt.file === this.fillerNoise.url && !this._fillerNoiseOn) {
-        this.logger.info({evt}, 'Gather:_startFillerNoise - race condition - kill filler noise here');
-        this.ep.api('uuid_break', this.ep.uuid)
-          .catch((err) => this.logger.info(err, 'Error killing filler noise'));
-        return;
-      } else this.logger.debug({evt}, 'Gather:_startFillerNoise - playback started');
-    });
-  }
-
  _startFillerNoiseTimer() {
    this._clearFillerNoiseTimer();
    this._fillerNoiseTimer = setTimeout(() => {
      this.logger.debug('Gather:_startFillerNoiseTimer - playing filler noise');
-      this._startFillerNoise();
+      this.ep?.play(this.fillerNoise.url);
    }, this.fillerNoise.startDelaySecs * 1000);
  }

@@ -773,7 +717,6 @@ class TaskGather extends SttTask {
      if (this.ep?.connected && (!this.playComplete || this.hasFillerNoise)) {
        this.logger.debug('Gather:_killAudio: killing playback of any audio');
        this.playComplete = true;
-        this._fillerNoiseOn = false;  // in a race, if we just started audio it may sneak through here
        this.ep.api('uuid_break', this.ep.uuid)
          .catch((err) => this.logger.info(err, 'Error killing audio'));
      }
@@ -797,7 +740,6 @@ class TaskGather extends SttTask {
    const finished = fsEvent.getHeader('transcription-session-finished');
    this.logger.debug({evt, bugname, finished, vendor: this.vendor}, 'Gather:_onTranscription raw transcript');
    if (bugname && this.bugname !== bugname) return;
-    if (finished === 'true') return;

    if (this.vendor === 'ibm' && evt?.state === 'listening') return;
    if (this.vendor === 'deepgram' && evt.type === 'UtteranceEnd') {
@@ -895,7 +837,7 @@ class TaskGather extends SttTask {
        if (this.bargein && (words + bufferedWords) < this.minBargeinWordCount) {
          this.logger.debug({evt, words, bufferedWords},
            'TaskGather:_onTranscription - final transcript but < min barge words');
-          if (!emptyTranscript) this._bufferedTranscripts.push(evt);
+          this._bufferedTranscripts.push(evt);
          if (!['soniox', 'aws', 'microsoft', 'deepgram'].includes(this.vendor)) this._startTranscribing(ep);
          return;
        }
@@ -959,9 +901,6 @@ class TaskGather extends SttTask {
          this._sonioxTranscripts.push(evt.vendor.finalWords);
        }
      }
-
-      /* restart asr timer if we get a partial transcript */
-      if (this.isContinuousAsr) this._startAsrTimer();
    }
  }
  _onEndOfUtterance(cs, ep) {
@@ -993,9 +932,9 @@ class TaskGather extends SttTask {
  _onTranscriptionComplete(cs, ep) {
    this.logger.debug('TaskGather:_onTranscriptionComplete');
  }
-
-  async _startFallback(cs, ep, evt) {
-    if (this.canFallback) {
+  async _onJambonzError(cs, ep, evt) {
+    this.logger.info({evt}, 'TaskGather:_onJambonzError');
+    if (this.isHandledByPrimaryProvider && this.fallbackVendor) {
      ep.stopTranscription({
        vendor: this.vendor,
        bugname: this.bugname
@@ -1003,35 +942,17 @@ class TaskGather extends SttTask {
        .catch((err) => this.logger.error({err}, `Error stopping transcription for primary vendor ${this.vendor}`));
      const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
      try {
-        this.logger.debug('gather:_startFallback');
-        this.notifyError({ msg: 'ASR error',
-          details:`STT Vendor ${this.vendor} error: ${evt.error || evt.reason}`, failover: 'in progress'});
-        await this._initFallback();
-        this._speechHandlersSet = false;
-        await this._setSpeechHandlers(cs, ep);
+        await this._fallback();
+        await this._initSpeech(cs, ep);
        this._startTranscribing(ep);
        updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
-        return true;
+        return;
      } catch (error) {
        this.logger.info({error}, `There is error while falling back to ${this.fallbackVendor}`);
-        this.notifyError({ msg: 'ASR error',
-          details:`STT Vendor ${this.vendor} error: ${evt.error || evt.reason}`, failover: 'not available'});
      }
-    } else {
-      this.logger.debug('gather:_startFallback no condition for falling back');
-      this.notifyError({ msg: 'ASR error',
-        details:`STT Vendor ${this.vendor} error: ${evt.error || evt.reason}`, failover: 'not available'});
    }
-    return false;
-  }
-
-  async _onJambonzError(cs, ep, evt) {
-    if (this.vendor === 'google' && evt.error_code === 0) {
-      this.logger.info({evt}, 'TaskTranscribe:_onJambonzError - ignoring google error code 0');
-      return;
-    }
-    this.logger.info({evt}, 'TaskGather:_onJambonzError');
    const {writeAlerts, AlertType} = cs.srf.locals;
+
    if (this.vendor === 'nuance') {
      const {code, error} = evt;
      if (code === 404 && error === 'No speech') return this._resolve('timeout');
@@ -1044,23 +965,17 @@ class TaskGather extends SttTask {
      message: `Custom speech vendor ${this.vendor} error: ${evt.error}`,
      vendor: this.vendor,
    }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
-    if (!(await this._startFallback(cs, ep, evt))) {
-      this.notifyTaskDone();
-    }
+    this.notifyError({msg: 'ASR error', details:`Custom speech vendor ${this.vendor} error: ${evt.error}`});
  }

-  async _onVendorConnectFailure(cs, _ep, evt) {
+  _onVendorConnectFailure(cs, _ep, evt) {
    super._onVendorConnectFailure(cs, _ep, evt);
-    if (!(await this._startFallback(cs, _ep, evt))) {
-      this.notifyTaskDone();
-    }
+    this.notifyTaskDone();
  }

-  async _onVendorError(cs, _ep, evt) {
+  _onVendorError(cs, _ep, evt) {
    super._onVendorError(cs, _ep, evt);
-    if (!(await this._startFallback(cs, _ep, evt))) {
-      this._resolve('stt-error', evt);
-    }
+    this._resolve('stt-error', evt);
  }

  _onVadDetected(cs, ep) {
@@ -1069,10 +984,6 @@ class TaskGather extends SttTask {
      this._killAudio(cs);
      this.emit('vad');
    }
-    if (this.vad?.strategy === 'one-shot') {
-      this.ep?.removeCustomEventListener(VadDetection.Detection, this._onVadDetected);
-      this._vadStarted = false;
-    }
  }

  _onNoSpeechDetected(cs, ep, evt, fsEvent) {
@@ -1091,16 +1002,6 @@ class TaskGather extends SttTask {

  async _resolve(reason, evt) {
    this.logger.debug(`TaskGather:resolve with reason ${reason}`);
-    if (this.needsStt && this.ep && this.ep.connected) {
-      this.ep.stopTranscription({
-        vendor: this.vendor,
-        bugname: this.bugname
-      })
-        .catch((err) => {
-          if (this.resolved) return;
-          this.logger.error({err}, 'Error stopping transcription');
-        });
-    }
    if (this.resolved) return;

    this.resolved = true;
@@ -1118,6 +1019,13 @@ class TaskGather extends SttTask {
      'stt.resolve': reason,
      'stt.result': JSON.stringify(evt)
    });
+    if (this.needsStt && this.ep && this.ep.connected) {
+      this.ep.stopTranscription({
+        vendor: this.vendor,
+        bugname: this.bugname
+      })
+        .catch((err) => this.logger.error({err}, 'Error stopping transcription'));
+    }

    if (this.callSession && this.callSession.callGone) {
      this.logger.debug('TaskGather:_resolve - call is gone, not invoking web callback');
@@ -1140,7 +1048,7 @@ class TaskGather extends SttTask {
      }
      else {
        this.logger.debug(`TaskGather:_resolve - playing filler noise: ${this.fillerNoiseUrl}`);
-        this._startFillerNoise();
+        this.ep.play(this.fillerNoiseUrl);
      }
    }

--- a/lib/tasks/listen.js
+++ b/lib/tasks/listen.js
@@ -8,10 +8,6 @@ const DTMF_SPAN_NAME = 'dtmf';
 class TaskListen extends Task {
  constructor(logger, opts, parentTask) {
    super(logger, opts);
-    /**
-     * @deprecated
-     * use bidirectionalAudio.enabled
-     */
    this.disableBidirectionalAudio = opts.disableBidirectionalAudio;
    this.preconditions = TaskPreconditions.Endpoint;

@@ -29,15 +25,6 @@ class TaskListen extends Task {
    this.results = {};
    this.playAudioQueue = [];
    this.isPlayingAudioFromQueue = false;
-    this.bidirectionalAudio = {
-      enabled: this.disableBidirectionalAudio === true ? false : true,
-      ...(this.data['bidirectionalAudio']),
-    };
-
-    // From drachtio-version 3.0.40, forkAudioStart will send empty bugname, metadata together with
-    // bidirectionalAudio params that cause old version of freeswitch missunderstand between bugname and
-    // bidirectionalAudio params
-    this._bugname = 'audio_fork';

    if (this.transcribe) this.transcribeTask = makeTask(logger, {'transcribe': opts.transcribe}, this);
  }
@@ -146,8 +133,7 @@ class TaskListen extends Task {
      mixType: this.mixType,
      sampling: this.sampleRate,
      ...(this._bugname && {bugname: this._bugname}),
-      metadata,
-      bidirectionalAudio: this.bidirectionalAudio || {}
+      metadata
    });
    this.recordStartTime = moment();
    if (this.maxLength) {
@@ -167,7 +153,7 @@ class TaskListen extends Task {
    }

    /* support bi-directional audio */
-    if (this.bidirectionalAudio.enabled) {
+    if (!this.disableBidirectionalAudio) {
      ep.addCustomEventListener(ListenEvents.PlayAudio, this._onPlayAudio.bind(this, ep));
    }
    ep.addCustomEventListener(ListenEvents.KillAudio, this._onKillAudio.bind(this, ep));
--- a/lib/tasks/say.js
+++ b/lib/tasks/say.js
@@ -52,154 +52,6 @@ class TaskSay extends TtsTask {
    return `${this.name}{${this.text[0]}}`;
  }

-  _validateURL(urlString) {
-    try {
-      new URL(urlString);
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
-  async _synthesizeWithSpecificVendor(cs, ep, {vendor, language, voice, label, preCache = false}) {
-    const {srf, accountSid:account_sid} = cs;
-    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, srf);
-    const {writeAlerts, AlertType, stats} = srf.locals;
-    const {synthAudio} = srf.locals.dbHelpers;
-    const engine = this.synthesizer.engine || 'standard';
-    const salt = cs.callSid;
-
-    let credentials = cs.getSpeechCredentials(vendor, 'tts', label);
-    /* parse Nuance voices into name and model */
-    let model;
-    if (vendor === 'nuance' && voice) {
-      const arr = /([A-Za-z-]*)\s+-\s+(enhanced|standard)/.exec(voice);
-      if (arr) {
-        voice = arr[1];
-        model = arr[2];
-      }
-    } else if (vendor === 'deepgram') {
-      model = voice;
-    }
-
-    /* allow for microsoft custom region voice and api_key to be specified as an override */
-    if (vendor === 'microsoft' && this.options.deploymentId) {
-      credentials = credentials || {};
-      credentials.use_custom_tts = true;
-      credentials.custom_tts_endpoint = this.options.deploymentId;
-      credentials.api_key = this.options.apiKey || credentials.apiKey;
-      credentials.region = this.options.region || credentials.region;
-      voice = this.options.voice || voice;
-    } else if (vendor === 'elevenlabs') {
-      credentials = credentials || {};
-      credentials.model_id = this.options.model_id || credentials.model_id;
-      credentials.voice_settings = this.options.voice_settings || {};
-      credentials.optimize_streaming_latency = this.options.optimize_streaming_latency
-      || credentials.optimize_streaming_latency;
-      voice = this.options.voice_id || voice;
-    }
-
-    ep.set({
-      tts_engine: vendor.startsWith('custom:') ? 'custom' : vendor,
-      tts_voice: voice,
-      cache_speech_handles: !cs.currentTtsVendor || cs.currentTtsVendor === vendor ? 1 : 0,
-    }).catch((err) => this.logger.info({err}, 'Error setting tts_engine on endpoint'));
-    // set the current vendor on the call session
-    // If vendor is changed from the previous one, then reset the cache_speech_handles flag
-    cs.currentTtsVendor = vendor;
-
-    if (!preCache) this.logger.info({vendor, language, voice, model}, 'TaskSay:exec');
-    try {
-      if (!credentials) {
-        writeAlerts({
-          account_sid,
-          alert_type: AlertType.TTS_NOT_PROVISIONED,
-          vendor
-        }).catch((err) => this.logger.info({err}, 'Error generating alert for no tts'));
-        throw new Error('no provisioned speech credentials for TTS');
-      }
-      // synthesize all of the text elements
-      let lastUpdated = false;
-
-      /* produce an audio segment from the provided text */
-      const generateAudio = async(text) => {
-        if (this.killed) return;
-        if (text.startsWith('silence_stream://')) return text;
-
-        /* otel: trace time for tts */
-        if (!preCache)  {
-          const {span} = this.startChildSpan('tts-generation', {
-            'tts.vendor': vendor,
-            'tts.language': language,
-            'tts.voice': voice
-          });
-          this.otelSpan = span;
-        }
-        try {
-          const {filePath, servedFromCache, rtt} = await synthAudio(stats, {
-            account_sid,
-            text,
-            vendor,
-            language,
-            voice,
-            engine,
-            model,
-            salt,
-            credentials,
-            options: this.options,
-            disableTtsCache : this.disableTtsCache,
-            preCache
-          });
-          if (!filePath.startsWith('say:')) {
-            this.logger.debug(`file ${filePath}, served from cache ${servedFromCache}`);
-            if (filePath) cs.trackTmpFile(filePath);
-            if (this.otelSpan) {
-              this.otelSpan.setAttributes({'tts.cached': servedFromCache});
-              this.otelSpan.end();
-              this.otelSpan = null;
-            }
-            if (!servedFromCache && !lastUpdated) {
-              lastUpdated = true;
-              updateSpeechCredentialLastUsed(credentials.speech_credential_sid).catch(() => {/* logged error */});
-            }
-            if (!servedFromCache && rtt && !preCache) {
-              this.notifyStatus({
-                event: 'synthesized-audio',
-                vendor,
-                language,
-                characters: text.length,
-                elapsedTime: rtt
-              });
-            }
-          }
-          else {
-            this.logger.debug('a streaming tts api will be used');
-            const modifiedPath = filePath.replace('say:{', `say:{session-uuid=${ep.uuid},`);
-            return modifiedPath;
-          }
-          return filePath;
-        } catch (err) {
-          this.logger.info({err}, 'Error synthesizing tts');
-          if (this.otelSpan) this.otelSpan.end();
-          writeAlerts({
-            account_sid: cs.accountSid,
-            alert_type: AlertType.TTS_FAILURE,
-            vendor,
-            detail: err.message
-          }).catch((err) => this.logger.info({err}, 'Error generating alert for tts failure'));
-          throw err;
-        }
-      };
-
-      const arr = this.text.map((t) => (this._validateURL(t) ? t : generateAudio(t)));
-      return (await Promise.all(arr)).filter((fp) => fp && fp.length);
-    } catch (err) {
-      this.logger.info(err, 'TaskSay:exec error');
-      throw err;
-    }
-
-  }
-
  async exec(cs, {ep}) {
    const {srf, accountSid:account_sid} = cs;
    const {writeAlerts, AlertType} = srf.locals;
@@ -209,16 +61,16 @@ class TaskSay extends TtsTask {
    await super.exec(cs);
    this.ep = ep;

-    let vendor = this.synthesizer.vendor && this.synthesizer.vendor !== 'default' ?
+    const vendor = this.synthesizer.vendor && this.synthesizer.vendor !== 'default' ?
      this.synthesizer.vendor :
      cs.speechSynthesisVendor;
-    let language = this.synthesizer.language && this.synthesizer.language !== 'default' ?
+    const language = this.synthesizer.language && this.synthesizer.language !== 'default' ?
      this.synthesizer.language :
      cs.speechSynthesisLanguage ;
-    let voice =  this.synthesizer.voice && this.synthesizer.voice !== 'default' ?
+    const voice =  this.synthesizer.voice && this.synthesizer.voice !== 'default' ?
      this.synthesizer.voice :
      cs.speechSynthesisVoice;
-    let label = this.synthesizer.label && this.synthesizer.label !== 'default' ?
+    const label = this.synthesizer.label && this.synthesizer.label !== 'default' ?
      this.synthesizer.label :
      cs.speechSynthesisLabel;

@@ -235,19 +87,12 @@ class TaskSay extends TtsTask {
      this.synthesizer.fallbackLabel :
      cs.fallbackSpeechSynthesisLabel;

-    if (cs.hasFallbackTts) {
-      vendor = fallbackVendor;
-      language = fallbackLanguage;
-      voice = fallbackVoice;
-      label = fallbackLabel;
-    }
-
-    const startFallback = async(error) => {
-      if (fallbackVendor && this.isHandledByPrimaryProvider && !cs.hasFallbackTts) {
-        this.notifyError(
-          { msg: 'TTS error', details:`TTS vendor ${vendor} error: ${error}`, failover: 'in progress'});
+    let filepath;
+    try {
+      filepath = await this._synthesizeWithSpecificVendor(cs, ep, {vendor, language, voice, label});
+    } catch (error) {
+      if (fallbackVendor && this.isHandledByPrimaryProvider) {
        this.isHandledByPrimaryProvider = false;
-        cs.hasFallbackTts = true;
        this.logger.info(`Synthesize error, fallback to ${fallbackVendor}`);
        filepath = await this._synthesizeWithSpecificVendor(cs, ep,
          {
@@ -257,16 +102,8 @@ class TaskSay extends TtsTask {
            label: fallbackLabel
          });
      } else {
-        this.notifyError(
-          { msg: 'TTS error', details:`TTS vendor ${vendor} error: ${error}`, failover: 'not available'});
        throw error;
      }
-    };
-    let filepath;
-    try {
-      filepath = await this._synthesizeWithSpecificVendor(cs, ep, {vendor, language, voice, label});
-    } catch (error) {
-      await startFallback(error);
    }
    this.notifyStatus({event: 'start-playback'});

@@ -313,38 +150,13 @@ class TaskSay extends TtsTask {
                text
              }).catch((err) => this.logger.info({err}, 'Error adding file to cache'));
            }
-            if (this._playResolve) {
-              evt.variable_tts_error ? this._playReject(new Error(evt.variable_tts_error)) : this._playResolve();
-            }
-          });
-          // wait for playback-stop event received to confirm if the playback is successful
-          this._playPromise = new Promise((resolve, reject) => {
-            this._playResolve = resolve;
-            this._playReject = reject;
          });
          await ep.play(filepath[segment]);
-          try {
-            // wait for playback-stop event received to confirm if the playback is successful
-            await this._playPromise;
-          } catch (err) {
-            try {
-              await startFallback(err);
-              continue;
-            } catch (err) {
-              this.logger.info({err}, 'Error waiting for playback-stop event');
-            }
-          } finally {
-            this._playPromise = null;
-            this._playResolve = null;
-            this._playReject = null;
-          }
          if (filepath[segment].startsWith('say:{')) {
            const arr = /^say:\{.*\}\s*(.*)$/.exec(filepath[segment]);
            if (arr) this.logger.debug(`Say:exec complete playing streaming tts request: ${arr[1].substring(0, 64)}..`);
-          } else {
-            // This log will print spech credentials in say command for tts stream mode
-            this.logger.debug(`Say:exec completed play file ${filepath[segment]}`);
          }
+          this.logger.debug(`Say:exec completed play file ${filepath[segment]}`);
        }
        segment++;
      }
@@ -366,8 +178,6 @@ class TaskSay extends TtsTask {
      }
      this.ep.removeAllListeners('playback-start');
      this.ep.removeAllListeners('playback-stop');
-      // if we are waiting for playback-stop event, resolve the promise
-      if (this._playResolve) this._playResolve();
    }
  }

@@ -377,10 +187,6 @@ class TaskSay extends TtsTask {
      if (key.startsWith('variable_tts_')) {
        let newKey = key.substring('variable_tts_'.length)
          .replace('whisper_', 'whisper.')
-          .replace('deepgram_', 'deepgram.')
-          .replace('playht_', 'playht.')
-          .replace('rimelabs_', 'rimelabs.')
-          .replace('verbio_', 'verbio.')
          .replace('elevenlabs_', 'elevenlabs.');
        if (spanMapping[newKey]) newKey = spanMapping[newKey];
        attrs[newKey] = value;
@@ -392,9 +198,6 @@ class TaskSay extends TtsTask {
 }

 const spanMapping = {
-  // IMPORTANT!!! JAMBONZ WEBAPP WILL SHOW TEXT PERFECTLY IF THE SPAN NAME IS SMALLER OR EQUAL 25 CHARACTERS.
-  // EX: whisper.ratelim_reqs has length 20 <= 25 which is perfect
-  // Elevenlabs
  'elevenlabs.reported_latency_ms': 'elevenlabs.latency_ms',
  'elevenlabs.request_id': 'elevenlabs.req_id',
  'elevenlabs.history_item_id': 'elevenlabs.item_id',
@@ -402,37 +205,11 @@ const spanMapping = {
  'elevenlabs.name_lookup_time_ms': 'name_lookup_ms',
  'elevenlabs.connect_time_ms': 'connect_ms',
  'elevenlabs.final_response_time_ms': 'final_response_ms',
-  // Whisper
  'whisper.reported_latency_ms': 'whisper.latency_ms',
  'whisper.request_id': 'whisper.req_id',
-  'whisper.reported_organization': 'whisper.organization',
-  'whisper.reported_ratelimit_requests': 'whisper.ratelimit',
-  'whisper.reported_ratelimit_remaining_requests': 'whisper.ratelimit_remain',
-  'whisper.reported_ratelimit_reset_requests': 'whisper.ratelimit_reset',
  'whisper.name_lookup_time_ms': 'name_lookup_ms',
  'whisper.connect_time_ms': 'connect_ms',
  'whisper.final_response_time_ms': 'final_response_ms',
-  // Deepgram
-  'deepgram.request_id': 'deepgram.req_id',
-  'deepgram.reported_model_name': 'deepgram.model_name',
-  'deepgram.reported_model_uuid': 'deepgram.model_uuid',
-  'deepgram.reported_char_count': 'deepgram.char_count',
-  'deepgram.name_lookup_time_ms': 'name_lookup_ms',
-  'deepgram.connect_time_ms': 'connect_ms',
-  'deepgram.final_response_time_ms': 'final_response_ms',
-  // Playht
-  'playht.request_id': 'playht.req_id',
-  'playht.name_lookup_time_ms': 'name_lookup_ms',
-  'playht.connect_time_ms': 'connect_ms',
-  'playht.final_response_time_ms': 'final_response_ms',
-  // Rimelabs
-  'rimelabs.name_lookup_time_ms': 'name_lookup_ms',
-  'rimelabs.connect_time_ms': 'connect_ms',
-  'rimelabs.final_response_time_ms': 'final_response_ms',
-  // verbio
-  'verbio.name_lookup_time_ms': 'name_lookup_ms',
-  'verbio.connect_time_ms': 'connect_ms',
-  'verbio.final_response_time_ms': 'final_response_ms',
 };

 module.exports = TaskSay;
--- a/lib/tasks/stt-task.js
+++ b/lib/tasks/stt-task.js
@@ -98,13 +98,6 @@ class SttTask extends Task {
      this.fallbackLabel = cs.fallbackSpeechRecognizerLabel;
      if (this.data.recognizer) this.data.recognizer.fallbackLabel = this.fallbackLabel;
    }
-    // If call is already fallback to 2nd ASR vendor
-    // use that.
-    if (cs.hasFallbackAsr) {
-      this.vendor = this.fallbackVendor;
-      this.language = this.fallbackLanguage;
-      this.label = this.fallbackLabel;
-    }
    if (!this.data.recognizer.vendor) {
      this.data.recognizer.vendor = this.vendor;
    }
@@ -122,19 +115,9 @@ class SttTask extends Task {
      try {
        this.sttCredentials = await this._initSpeechCredentials(this.cs, this.vendor, this.label);
      } catch (error) {
-        if (this.canFallback) {
-          this.notifyError(
-            {
-              msg: 'ASR error', details:`Invalid vendor ${this.vendor}, Error: ${error}`,
-              failover: 'in progress'
-            });
-          await this._initFallback();
+        if (this.fallbackVendor && this.isHandledByPrimaryProvider) {
+          await this._fallback();
        } else {
-          this.notifyError(
-            {
-              msg: 'ASR error', details:`Invalid vendor ${this.vendor}, Error: ${error}`,
-              failover: 'not available'
-            });
          throw error;
        }
      }
@@ -166,7 +149,7 @@ class SttTask extends Task {
  }

  async _initSpeechCredentials(cs, vendor, label) {
-    const {getNuanceAccessToken, getIbmAccessToken, getAwsAuthToken, getVerbioAccessToken} = cs.srf.locals.dbHelpers;
+    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;
    let credentials = cs.getSpeechCredentials(vendor, 'stt', label);

    if (!credentials) {
@@ -177,6 +160,11 @@ class SttTask extends Task {
        alert_type: AlertType.STT_NOT_PROVISIONED,
        vendor
      }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
+      // Notify application that STT vender is wrong.
+      this.notifyError({
+        msg: 'ASR error',
+        details: `No speech-to-text service credentials for ${vendor} have been configured`
+      });
      this.notifyTaskDone();
      throw new Error(`No speech-to-text service credentials for ${vendor} have been configured`);
    }
@@ -194,29 +182,13 @@ class SttTask extends Task {
      const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
      this.logger.debug({stt_api_key}, `got ibm access token ${servedFromCache ? 'from cache' : ''}`);
      credentials = {...credentials, access_token, stt_region};
-    } else if (['aws', 'polly'].includes(vendor) && credentials.roleArn) {
-      /* get aws access token */
-      const {roleArn} = credentials;
-      const {accessKeyId, secretAccessKey, sessionToken, servedFromCache} = await getAwsAuthToken(roleArn);
-      this.logger.debug({roleArn}, `got aws access token ${servedFromCache ? 'from cache' : ''}`);
-      credentials = {...credentials, accessKeyId, secretAccessKey, sessionToken};
-    } else if (vendor === 'verbio' && credentials.client_id && credentials.client_secret) {
-      const {access_token, servedFromCache} = await getVerbioAccessToken(credentials);
-      this.logger.debug({client_id: credentials.client_id},
-        `got verbio access token ${servedFromCache ? 'from cache' : ''}`);
-      credentials.access_token = access_token;
    }
    return credentials;
  }

-  get canFallback() {
-    return this.fallbackVendor && this.isHandledByPrimaryProvider && !this.cs.hasFallbackAsr;
-  }
-
-  async _initFallback() {
+  async _fallback() {
    assert(this.fallbackVendor, 'fallback failed without fallbackVendor configuration');
    this.isHandledByPrimaryProvider = false;
-    this.cs.hasFallbackAsr = true;
    this.logger.info(`Failed to use primary STT provider, fallback to ${this.fallbackVendor}`);
    this.vendor = this.fallbackVendor;
    this.language = this.fallbackLanguage;
@@ -225,8 +197,6 @@ class SttTask extends Task {
    this.data.recognizer.language = this.language;
    this.data.recognizer.label = this.label;
    this.sttCredentials = await this._initSpeechCredentials(this.cs, this.vendor, this.label);
-    // cleanup previous listener from previous vendor
-    this.removeCustomEventListeners();
  }

  async compileHintsForCobalt(ep, hostport, model, token, hints) {
@@ -270,20 +240,6 @@ class SttTask extends Task {
  _doContinuousAsrWithDeepgram(asrTimeout) {
    /* deepgram has an utterance_end_ms property that simplifies things */
    assert(this.vendor === 'deepgram');
-    if (asrTimeout < 1000) {
-      this.notifyError({
-        msg: 'ASR error',
-        details:`asrTimeout ${asrTimeout} is too short for deepgram; setting it to 1000ms`
-      });
-      asrTimeout = 1000;
-    }
-    else if (asrTimeout > 5000) {
-      this.notifyError({
-        msg: 'ASR error',
-        details:`asrTimeout ${asrTimeout} is too long for deepgram; setting it to 5000ms`
-      });
-      asrTimeout = 5000;
-    }
    this.logger.debug(`_doContinuousAsrWithDeepgram - setting utterance_end_ms to ${asrTimeout}`);
    const dgOptions = this.data.recognizer.deepgramOptions = this.data.recognizer.deepgramOptions || {};
    dgOptions.utteranceEndMs = dgOptions.utteranceEndMs || asrTimeout;
@@ -303,6 +259,7 @@ class SttTask extends Task {
      detail: evt.error,
      vendor: this.vendor,
    }).catch((err) => this.logger.info({err}, `Error generating alert for ${this.vendor} connection failure`));
+    this.notifyError({msg: 'ASR error', details:`Failed connecting to speech vendor ${this.vendor}: ${evt.error}`});
  }

  _onVendorConnectFailure(cs, _ep, evt) {
@@ -315,6 +272,7 @@ class SttTask extends Task {
      message: `Failed connecting to ${this.vendor} speech recognizer: ${reason}`,
      vendor: this.vendor,
    }).catch((err) => this.logger.info({err}, `Error generating alert for ${this.vendor} connection failure`));
+    this.notifyError({msg: 'ASR error', details:`Failed connecting to speech vendor ${this.vendor}: ${reason}`});
  }
 }

--- a/lib/tasks/transcribe.js
+++ b/lib/tasks/transcribe.js
@@ -58,7 +58,7 @@ class TaskTranscribe extends SttTask {
      this.isContinuousAsr = true;
    }
    /* buffer speech for continuous asr */
-    this._bufferedTranscripts = [ [], [] ];  // for channel 1 and 2
+    this._bufferedTranscripts = [];
    this.bugname_prefix = 'transcribe_';
    this.paused = false;
  }
@@ -104,15 +104,12 @@ class TaskTranscribe extends SttTask {

      updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid)
        .catch(() => {/*already logged error */});
+
+      await this.awaitTaskDone();
    } catch (err) {
-      if (!(await this._startFallback(cs, ep, {error: err}))) {
-        this.logger.info(err, 'TaskTranscribe:exec - error');
-        this.parentTask && this.parentTask.emit('error', err);
-        this.removeCustomEventListeners();
-        return;
-      }
+      this.logger.info(err, 'TaskTranscribe:exec - error');
+      this.parentTask && this.parentTask.emit('error', err);
    }
-    await this.awaitTaskDone();
    this.removeCustomEventListeners();
  }

@@ -126,7 +123,7 @@ class TaskTranscribe extends SttTask {
      })
        .catch((err) => this.logger.info(err, 'Error TaskTranscribe:kill'));
    }
-    if (this.transcribing2 && this.ep2?.connected) {
+    if (this.transcribing2 && this.ep2.connected) {
      stopTranscription = true;
      this.ep2.stopTranscription({vendor: this.vendor, bugname: this.bugname})
        .catch((err) => this.logger.info(err, 'Error TaskTranscribe:kill'));
@@ -197,8 +194,8 @@ class TaskTranscribe extends SttTask {
        this.bugname = `${this.bugname_prefix}azure_transcribe`;
        this.addCustomEventListener(ep, AzureTranscriptionEvents.Transcription,
          this._onTranscription.bind(this, cs, ep, channel));
-        //this.addCustomEventListener(ep, AzureTranscriptionEvents.NoSpeechDetected,
-        //  this._onNoAudio.bind(this, cs, ep, channel));
+        this.addCustomEventListener(ep, AzureTranscriptionEvents.NoSpeechDetected,
+          this._onNoAudio.bind(this, cs, ep, channel));
        break;
      case 'nuance':
        this.bugname = `${this.bugname_prefix}nuance_transcribe`;
@@ -329,7 +326,6 @@ class TaskTranscribe extends SttTask {
    // make sure this is not a transcript from answering machine detection
    const bugname = fsEvent.getHeader('media-bugname');
    const finished = fsEvent.getHeader('transcription-session-finished');
-    const bufferedTranscripts = this._bufferedTranscripts[channel - 1];
    if (bugname && this.bugname !== bugname) return;
    if (this.paused) {
      this.logger.debug({evt}, 'TaskTranscribe:_onTranscription - paused, ignoring transcript');
@@ -339,14 +335,14 @@ class TaskTranscribe extends SttTask {

    if (this.vendor === 'deepgram' && evt.type === 'UtteranceEnd') {
      /* we will only get this when we have set utterance_end_ms */
-      if (bufferedTranscripts.length === 0) {
+      if (this._bufferedTranscripts.length === 0) {
        this.logger.debug('Gather:_onTranscription - got UtteranceEnd event from deepgram but no buffered transcripts');
      }
      else {
        this.logger.debug('Gather:_onTranscription - got UtteranceEnd event from deepgram, return buffered transcript');
-        evt = this.consolidateTranscripts(bufferedTranscripts, channel, this.language, this.vendor);
+        evt = this.consolidateTranscripts(this._bufferedTranscripts, 1, this.language, this.vendor);
        evt.is_final = true;
-        this._bufferedTranscripts[channel - 1] = [];
+        this._bufferedTranscripts = [];
        this._resolve(channel, evt);
      }
      return;
@@ -363,11 +359,11 @@ class TaskTranscribe extends SttTask {

    let emptyTranscript = false;
    if (evt.is_final) {
-      if (evt.alternatives.length === 0 || evt.alternatives[0].transcript === '' && !cs.callGone && !this.killed) {
+      if (evt.alternatives[0].transcript === '' && !cs.callGone && !this.killed) {
        emptyTranscript = true;
        if (finished === 'true' &&
          ['microsoft', 'deepgram'].includes(this.vendor) &&
-          bufferedTranscripts.length === 0) {
+          this._bufferedTranscripts.length === 0) {
          this.logger.debug({evt}, 'TaskGather:_onTranscription - got empty transcript from old gather, disregarding');
          return;
        }
@@ -380,7 +376,7 @@ class TaskTranscribe extends SttTask {
            'TaskGather:_onTranscription - got empty deepgram transcript during continous asr, continue listening');
          return;
        }
-        else if (this.vendor === 'deepgram' && bufferedTranscripts.length > 0) {
+        else if (this.vendor === 'deepgram' && this._bufferedTranscripts.length > 0) {
          this.logger.info({evt},
            'TaskGather:_onTranscription - got empty transcript from deepgram, return the buffered transcripts');
        }
@@ -396,12 +392,11 @@ class TaskTranscribe extends SttTask {
          }
        }
        this.logger.info({evt}, 'TaskGather:_onTranscription - got transcript during continous asr');
-        bufferedTranscripts.push(evt);
+        this._bufferedTranscripts.push(evt);
        this._startAsrTimer(channel);

        /* some STT engines will keep listening after a final response, so no need to restart */
-        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'google']
-          .includes(this.vendor)) this._startTranscribing(cs, ep, channel);
+        if (!['soniox', 'aws', 'microsoft', 'deepgram'].includes(this.vendor)) this._startTranscribing(cs, ep, channel);
      }
      else {
        if (this.vendor === 'soniox') {
@@ -412,20 +407,19 @@ class TaskTranscribe extends SttTask {
        }
        else if (this.vendor === 'deepgram') {
          /* compile transcripts into one */
-          if (!emptyTranscript) bufferedTranscripts.push(evt);
+          if (!emptyTranscript) this._bufferedTranscripts.push(evt);

          /* deepgram can send an empty and final transcript; only if we have any buffered should we resolve */
-          if (bufferedTranscripts.length === 0) return;
-          evt = this.consolidateTranscripts(bufferedTranscripts, channel, this.language);
-          this._bufferedTranscripts[channel - 1] = [];
+          if (this._bufferedTranscripts.length === 0) return;
+          evt = this.consolidateTranscripts(this._bufferedTranscripts, channel, this.language);
+          this._bufferedTranscripts = [];
        }

        /* here is where we return a final transcript */
        this.logger.debug({evt}, 'TaskTranscribe:_onTranscription - sending final transcript');
        this._resolve(channel, evt);
        /* some STT engines will keep listening after a final response, so no need to restart */
-        if (!['soniox', 'aws', 'microsoft', 'deepgram', 'google']
-          .includes(this.vendor)) this._startTranscribing(cs, ep, channel);
+        if (!['soniox', 'aws', 'microsoft', 'deepgram'].includes(this.vendor)) this._startTranscribing(cs, ep, channel);
      }
    }
    else {
@@ -436,7 +430,7 @@ class TaskTranscribe extends SttTask {
        const originalEvent = evt.vendor.evt;
        if (originalEvent.is_final && evt.alternatives[0].transcript !== '') {
          this.logger.debug({evt}, 'Gather:_onTranscription - buffering a completed (partial) deepgram transcript');
-          bufferedTranscripts.push(evt);
+          this._bufferedTranscripts.push(evt);
        }
      }

@@ -537,8 +531,10 @@ class TaskTranscribe extends SttTask {
    }
  }

-  async _startFallback(cs, _ep, evt) {
-    if (this.canFallback) {
+  async _onJambonzError(cs, _ep, evt) {
+    this.logger.info({evt}, 'TaskTranscribe:_onJambonzError');
+    if (this.paused) return;
+    if (this.isHandledByPrimaryProvider && this.fallbackVendor) {
      _ep.stopTranscription({
        vendor: this.vendor,
        bugname: this.bugname
@@ -546,57 +542,38 @@ class TaskTranscribe extends SttTask {
        .catch((err) => this.logger.error({err}, `Error stopping transcription for primary vendor ${this.vendor}`));
      const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
      try {
-        this.notifyError({ msg: 'ASR error',
-          details:`STT Vendor ${this.vendor} error: ${evt.error || evt.reason}`, failover: 'in progress'});
-        await this._initFallback();
+        await this._fallback();
        let channel = 1;
        if (this.ep !== _ep) {
          channel = 2;
        }
-        this[`_speechHandlersSet_${channel}`] = false;
        this._startTranscribing(cs, _ep, channel);
        updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
-        return true;
+        return;
      } catch (error) {
-        this.notifyError({ msg: 'ASR error',
-          details:`STT Vendor ${this.vendor} error: ${evt.error || evt.reason}`, failover: 'not available'});
        this.logger.info({error}, `There is error while falling back to ${this.fallbackVendor}`);
      }
    } else {
-      this.logger.debug('transcribe:_startFallback no condition for falling back');
-      this.notifyError({ msg: 'ASR error',
-        details:`STT Vendor ${this.vendor} error: ${evt.error || evt.reason}`, failover: 'not available'});
-    }
-    return false;
-  }
+      const {writeAlerts, AlertType} = cs.srf.locals;

-  async _onJambonzError(cs, _ep, evt) {
-    if (this.vendor === 'google' && evt.error_code === 0) {
-      this.logger.info({evt}, 'TaskTranscribe:_onJambonzError - ignoring google error code 0');
-      return;
-    }
-    this.logger.info({evt}, 'TaskTranscribe:_onJambonzError');
-    if (this.paused) return;
-    const {writeAlerts, AlertType} = cs.srf.locals;
-
-    if (this.vendor === 'nuance') {
-      const {code, error} = evt;
-      if (code === 404 && error === 'No speech') return this._resolve('timeout');
-      if (code === 413 && error === 'Too much speech') return this._resolve('timeout');
-    }
-    this.logger.info({evt}, 'TaskTranscribe:_onJambonzError');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      message: `Custom speech vendor ${this.vendor} error: ${evt.error}`,
-      vendor: this.vendor,
-    }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
-    if (!(await this._startFallback(cs, _ep, evt))) {
-      this.notifyTaskDone();
+      if (this.vendor === 'nuance') {
+        const {code, error} = evt;
+        //TODO: fix below, currently _resolve does not send timeout events
+        if (code === 404 && error === 'No speech') return this._resolve('timeout');
+        if (code === 413 && error === 'Too much speech') return this._resolve('timeout');
+      }
+      this.logger.info({evt}, 'TaskTranscribe:_onJambonzError');
+      writeAlerts({
+        account_sid: cs.accountSid,
+        alert_type: AlertType.STT_FAILURE,
+        message: `Custom speech vendor ${this.vendor} error: ${evt.error}`,
+        vendor: this.vendor,
+      }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
+      this.notifyError({msg: 'ASR error', details:`Custom speech vendor ${this.vendor} error: ${evt.error}`});
    }
  }

-  async _onVendorConnectFailure(cs, _ep, channel, evt) {
+  _onVendorConnectFailure(cs, _ep, channel, evt) {
    super._onVendorConnectFailure(cs, _ep, evt);
    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
      this.childSpan[channel - 1].span.setAttributes({
@@ -605,9 +582,7 @@ class TaskTranscribe extends SttTask {
      });
      this.childSpan[channel - 1].span.end();
    }
-    if (!(await this._startFallback(cs, _ep, evt))) {
-      this.notifyTaskDone();
-    }
+    this.notifyTaskDone();
  }

  _startAsrTimer(channel) {
@@ -616,9 +591,8 @@ class TaskTranscribe extends SttTask {
    this._clearAsrTimer(channel);
    this._asrTimer = setTimeout(() => {
      this.logger.debug(`TaskTranscribe:_startAsrTimer - asr timer went off for channel: ${channel}`);
-      const evt = this.consolidateTranscripts(
-        this._bufferedTranscripts[channel - 1], channel, this.language, this.vendor);
-      this._bufferedTranscripts[channel - 1] = [];
+      const evt = this.consolidateTranscripts(this._bufferedTranscripts, channel, this.language, this.vendor);
+      this._bufferedTranscripts = [];
      this._resolve(channel, evt);
    }, this.asrTimeout);
    this.logger.debug(`TaskTranscribe:_startAsrTimer: set for ${this.asrTimeout}ms for channel ${channel}`);
--- a/lib/utils/background-task-manager.js
+++ b/lib/utils/background-task-manager.js
@@ -26,7 +26,7 @@ class BackgroundTaskManager extends Emitter {
    return this.tasks.size;
  }

-  async newTask(type, opts, sticky = false) {
+  async newTask(type, opts) {
    this.logger.info({opts}, `initiating Background task ${type}`);
    if (this.tasks.has(type)) {
      this.logger.info(`Background task ${type} is running, skipped`);
@@ -52,7 +52,6 @@ class BackgroundTaskManager extends Emitter {
    if (task) {
      this.tasks.set(type, task);
    }
-    if (task && sticky) task.sticky = true;
    return task;
  }

@@ -117,7 +116,7 @@ class BackgroundTaskManager extends Emitter {
          this._taskCompleted('bargeIn', task);
          if (task.sticky && !this.cs.callGone && !this.cs._stopping) {
            this.logger.info('BackgroundTaskManager:_initBargeIn: restarting background bargeIn');
-            this.newTask('bargeIn', opts, true);
+            this.newTask('bargeIn', opts);
          }
          return;
        })
--- a/lib/utils/constants.json
+++ b/lib/utils/constants.json
@@ -97,10 +97,6 @@
    "Transcription": "soniox_transcribe::transcription",
    "Error": "soniox_transcribe::error"
  },
-  "VerbioTranscriptionEvents": {
-    "Transcription": "verbio_transcribe::transcription",
-    "Error": "verbio_transcribe::error"
-  },
  "CobaltTranscriptionEvents": {
    "Transcription": "cobalt_speech::transcription",
    "CompileContext": "cobalt_speech::compile_context_response",
@@ -138,9 +134,6 @@
    "ConnectFailure": "assemblyai_transcribe::connect_failed",
    "Connect": "assemblyai_transcribe::connect"
  },
-  "VadDetection": {
-    "Detection": "vad_detect:detection"
-  },
  "ListenEvents": {
    "Connect": "mod_audio_fork::connect",
    "ConnectFailure": "mod_audio_fork::connect_failed",
@@ -178,7 +171,6 @@
    "session:new",
    "session:reconnect",
    "session:redirect",
-    "session:adulting",
    "call:status",
    "queue:status",
    "dial:confirm",
--- a/lib/utils/db-utils.js
+++ b/lib/utils/db-utils.js
@@ -41,7 +41,6 @@ const speechMapper = (cred) => {
      const o = JSON.parse(decrypt(credential));
      obj.access_key_id = o.access_key_id;
      obj.secret_access_key = o.secret_access_key;
-      obj.role_arn = o.role_arn;
      obj.aws_region = o.aws_region;
    }
    else if ('microsoft' === obj.vendor) {
@@ -95,17 +94,6 @@ const speechMapper = (cred) => {
      obj.api_key = o.api_key;
      obj.model_id = o.model_id;
      obj.options = o.options;
-    } else if ('playht' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-      obj.user_id = o.user_id;
-      obj.voice_engine = o.voice_engine;
-      obj.options = o.options;
-    } else if ('rimelabs' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.api_key = o.api_key;
-      obj.model_id = o.model_id;
-      obj.options = o.options;
    } else if ('assemblyai' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
@@ -113,11 +101,6 @@ const speechMapper = (cred) => {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
      obj.model_id = o.model_id;
-    }  else if ('verbio' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.client_id = o.client_id;
-      obj.client_secret = o.client_secret;
-      obj.engine_version = o.engine_version;
    } else if (obj.vendor.startsWith('custom:')) {
      const o = JSON.parse(decrypt(credential));
      obj.auth_token = o.auth_token;
--- a/lib/utils/install-srf-locals.js
+++ b/lib/utils/install-srf-locals.js
@@ -171,7 +171,7 @@ function installSrfLocals(srf, logger) {
    retrieveFromSortedSet,
    retrieveByPatternSortedSet,
    sortedSetLength,
-    sortedSetPositionByPattern,
+    sortedSetPositionByPattern
  } = require('@jambonz/realtimedb-helpers')({}, logger, tracer);
  const registrar = new Registrar(logger, client);
  const {
@@ -179,8 +179,6 @@ function installSrfLocals(srf, logger) {
    addFileToCache,
    getNuanceAccessToken,
    getIbmAccessToken,
-    getAwsAuthToken,
-    getVerbioAccessToken
  } = require('@jambonz/speech-utils')({}, logger);
  const {
    writeAlerts,
@@ -218,7 +216,6 @@ function installSrfLocals(srf, logger) {
      listCalls,
      deleteCall,
      synthAudio,
-      getAwsAuthToken,
      addFileToCache,
      createHash,
      retrieveHash,
@@ -240,8 +237,7 @@ function installSrfLocals(srf, logger) {
      retrieveFromSortedSet,
      retrieveByPatternSortedSet,
      sortedSetLength,
-      sortedSetPositionByPattern,
-      getVerbioAccessToken
+      sortedSetPositionByPattern
    },
    parentLogger: logger,
    getSBC,
--- a/lib/utils/place-outdial.js
+++ b/lib/utils/place-outdial.js
@@ -413,7 +413,6 @@ class SingleDialer extends Emitter {
    const app = {...application};
    if ('WS' === app.call_hook?.method ||
      app.call_hook?.url.startsWith('ws://') || app.call_hook?.url.startsWith('wss://')) {
-      if (app.call_hook?.url) app.call_hook.url += '/adulting';
      const requestor = new WsRequestor(logger, this.accountInfo.account.account_sid,
        app.call_hook, this.accountInfo.account.webhook_secret);
      app.requestor = requestor;
@@ -439,13 +438,6 @@ class SingleDialer extends Emitter {
      tasks,
      rootSpan
    });
-    app.requestor.request('session:adulting', '/adulting', {
-      ...cs.callInfo.toJSON(),
-      parentCallInfo: this.parentCallInfo
-    }).catch((err) => {
-      newLogger.error({err}, 'doAdulting: error sending adulting request');
-    });
-
    cs.req = this.req;
    cs.exec().catch((err) => newLogger.error({err}, 'doAdulting: error executing session'));
    return cs;
--- a/lib/utils/transcription-utils.js
+++ b/lib/utils/transcription-utils.js
@@ -270,7 +270,7 @@ const normalizeDeepgram = (evt, channel, language, shortUtterance) => {
    language_code: language,
    channel_tag: channel,
    is_final: shortUtterance ? evt.is_final : evt.speech_final,
-    alternatives: alternatives.length ? [alternatives[0]] : [],
+    alternatives: [alternatives[0]],
    vendor: {
      name: 'deepgram',
      evt: copy
@@ -474,13 +474,27 @@ module.exports = (logger) => {

  const setChannelVarsForStt = (task, sttCredentials, language, rOpts = {}) => {
    let opts = {};
+    const {enable, voiceMs = 0, mode = -1} = rOpts.vad || {};
+    const vad = {enable, voiceMs, mode};
    const vendor = rOpts.vendor;

+    /* voice activity detection works across vendors */
+    opts = {
+      ...opts,
+      ...(vad.enable && {START_RECOGNIZING_ON_VAD: 1}),
+      ...(vad.enable && vad.voiceMs && {RECOGNIZER_VAD_VOICE_MS: vad.voiceMs}),
+      ...(vad.enable && typeof vad.mode === 'number' && {RECOGNIZER_VAD_MODE: vad.mode}),
+    };
+
    if ('google' === vendor) {
-      const useV2 = rOpts.googleOptions?.serviceVersion === 'v2';
-      const model = task.name === TaskName.Gather ?
-        (useV2 ? 'telephony_short' : 'command_and_search') :
-        (useV2 ? 'long' : 'latest_long');
+      const model = task.name === TaskName.Gather ? 'command_and_search' : 'latest_long';
+      /**
+       * When we support google v2 the models are different and we will want something like:
+       * const useV2 = sttCredentials?.credentials?.project_id; //TODO: v2 pref should be set in googleOptions
+       * const model = task.name === TaskName.Gather ?
+       *  (useV2 ? 'telephony_short' : 'command_and_search') :
+       * (useV2 ? 'long' : 'latest_long');
+       */
      opts = {
        ...opts,
        ...(sttCredentials && {GOOGLE_APPLICATION_CREDENTIALS: JSON.stringify(sttCredentials.credentials)}),
@@ -513,26 +527,12 @@ module.exports = (logger) => {
        ...{GOOGLE_SPEECH_MODEL: rOpts.model || model},
        ...(rOpts.naicsCode > 0 && {GOOGLE_SPEECH_METADATA_INDUSTRY_NAICS_CODE: rOpts.naicsCode}),
        GOOGLE_SPEECH_METADATA_RECORDING_DEVICE_TYPE: 'phone_line',
+        /*
        ...(useV2 && {
          GOOGLE_SPEECH_RECOGNIZER_PARENT: `projects/${sttCredentials.credentials.project_id}/locations/global`,
-          GOOGLE_SPEECH_CLOUD_SERVICES_VERSION: 'v2',
-          ...(rOpts.googleOptions?.speechStartTimeoutMs && {
-            GOOGLE_SPEECH_START_TIMEOUT_MS: rOpts.googleOptions.speechStartTimeoutMs
-          }),
-          ...(rOpts.googleOptions?.speechEndTimeoutMs && {
-            GOOGLE_SPEECH_END_TIMEOUT_MS: rOpts.googleOptions.speechEndTimeoutMs
-          }),
-          ...(rOpts.googleOptions?.transcriptNormalization && {
-            GOOGLE_SPEECH_TRANSCRIPTION_NORMALIZATION: JSON.stringify(rOpts.googleOptions.transcriptNormalization)
-          }),
-          ...(rOpts.googleOptions?.enableVoiceActivityEvents && {
-            GOOGLE_SPEECH_ENABLE_VOICE_ACTIVITY_EVENTS: rOpts.googleOptions.enableVoiceActivityEvents
-          }),
-          ...(rOpts.sgoogleOptions?.recognizerId) && {GOOGLE_SPEECH_RECOGNIZER_ID: rOpts.googleOptions.recognizerId},
-          ...(rOpts.googleOptions?.enableVoiceActivityEvents && {
-            GOOGLE_SPEECH_ENABLE_VOICE_ACTIVITY_EVENTS: rOpts.googleOptions.enableVoiceActivityEvents
-          }),
-        }),
+          GOOGLE_SPEECH_CLOUD_SERVICES_VERSION: 'v2'
+      }),
+      */
      };
    }
    else if (['aws', 'polly'].includes(vendor)) {
@@ -542,10 +542,9 @@ module.exports = (logger) => {
        ...(rOpts.vocabularyFilterName && {AWS_VOCABULARY_FILTER_NAME: rOpts.vocabularyFilterName}),
        ...(rOpts.filterMethod && {AWS_VOCABULARY_FILTER_METHOD: rOpts.filterMethod}),
        ...(sttCredentials && {
-          ...(sttCredentials.accessKeyId && {AWS_ACCESS_KEY_ID: sttCredentials.accessKeyId}),
-          ...(sttCredentials.secretAccessKey && {AWS_SECRET_ACCESS_KEY: sttCredentials.secretAccessKey}),
-          AWS_REGION: sttCredentials.region,
-          ...(sttCredentials.sessionToken && {AWS_SESSION_TOKEN: sttCredentials.sessionToken}),
+          AWS_ACCESS_KEY_ID: sttCredentials.accessKeyId,
+          AWS_SECRET_ACCESS_KEY: sttCredentials.secretAccessKey,
+          AWS_REGION: sttCredentials.region
        }),
      };
    }
@@ -681,9 +680,7 @@ module.exports = (logger) => {
        ...(deepgramOptions.keywords) &&
          {DEEPGRAM_SPEECH_KEYWORDS: deepgramOptions.keywords.join(',')},
        ...('endpointing' in deepgramOptions) &&
-          {DEEPGRAM_SPEECH_ENDPOINTING: deepgramOptions.endpointing === false ? 'false' : deepgramOptions.endpointing,
-            // default DEEPGRAM_SPEECH_UTTERANCE_END_MS is 1000, will be override by user settings later if there is.
-            DEEPGRAM_SPEECH_UTTERANCE_END_MS: 1000},
+          {DEEPGRAM_SPEECH_ENDPOINTING: deepgramOptions.endpointing === false ? 'false' : deepgramOptions.endpointing},
        ...(deepgramOptions.utteranceEndMs) &&
          {DEEPGRAM_SPEECH_UTTERANCE_END_MS: deepgramOptions.utteranceEndMs},
        ...(deepgramOptions.vadTurnoff) &&
@@ -796,26 +793,8 @@ module.exports = (logger) => {
        ...(rOpts.hints?.length > 0 &&
          {ASSEMBLYAI_WORD_BOOST: JSON.stringify(rOpts.hints)})
      };
-    } else if ('verbio' === vendor) {
-      const {verbioOptions = {}} = rOpts;
-      opts = {
-        ...opts,
-        ...(sttCredentials.access_token && { VERBIO_ACCESS_TOKEN: sttCredentials.access_token}),
-        ...(sttCredentials.engine_version && {VERBIO_ENGINE_VERSION: sttCredentials.engine_version}),
-        ...(language && {VERBIO_LANGUAGE: language}),
-        ...(verbioOptions.enable_formatting && {VERBIO_ENABLE_FORMATTING: verbioOptions.enable_formatting}),
-        ...(verbioOptions.enable_diarization && {VERBIO_ENABLE_DIARIZATION: verbioOptions.enable_diarization}),
-        ...(verbioOptions.topic && {VERBIO_TOPIC: verbioOptions.topic}),
-        ...(verbioOptions.inline_grammar && {VERBIO_INLINE_GRAMMAR: verbioOptions.inline_grammar}),
-        ...(verbioOptions.grammar_uri && {VERBIO_GRAMMAR_URI: verbioOptions.grammar_uri}),
-        ...(verbioOptions.label && {VERBIO_LABEL: verbioOptions.label}),
-        ...(verbioOptions.recognition_timeout && {VERBIO_RECOGNITION_TIMEOUT: verbioOptions.recognition_timeout}),
-        ...(verbioOptions.speech_complete_timeout &&
-          {VERBIO_SPEECH_COMPLETE_TIMEOUT: verbioOptions.speech_complete_timeout}),
-        ...(verbioOptions.speech_incomplete_timeout &&
-          {VERBIO_SPEECH_INCOMPLETE_TIMEOUT: verbioOptions.speech_incomplete_timeout}),
-      };
-    } else if (vendor.startsWith('custom:')) {
+    }
+    else if (vendor.startsWith('custom:')) {
      let {options = {}} = rOpts;
      const {auth_token, custom_stt_url} = sttCredentials;
      options = {
--- a/lib/utils/ws-requestor.js
+++ b/lib/utils/ws-requestor.js
@@ -56,12 +56,6 @@ class WsRequestor extends BaseRequestor {
    }

    if (type === 'session:new') this.call_sid = params.callSid;
-    if (type === 'session:reconnect') {
-      this._reconnectPromise = new Promise((resolve, reject) => {
-        this._reconnectResolve = resolve;
-        this._reconnectReject = reject;
-      });
-    }

    /* if we have an absolute url, and it is http then do a standard webhook */
    if (this._isAbsoluteUrl(url) && url.startsWith('http')) {
@@ -77,23 +71,20 @@ class WsRequestor extends BaseRequestor {
    }

    /* connect if necessary */
-    const queueMsg = () => {
-      this.logger.debug(
-        `WsRequestor:request(${this.id}) - queueing ${type} message since we are connecting`);
-      if (wantsAck) {
-        const p = new Promise((resolve, reject) => {
-          this.queuedMsg.push({type, hook, params, httpHeaders, promise: {resolve, reject}});
-        });
-        return p;
-      }
-      else {
-        this.queuedMsg.push({type, hook, params, httpHeaders});
-      }
-      return;
-    };
    if (!this.ws) {
      if (this.connectInProgress) {
-        return queueMsg();
+        this.logger.debug(
+          `WsRequestor:request(${this.id}) - queueing ${type} message since we are connecting`);
+        if (wantsAck) {
+          const p = new Promise((resolve, reject) => {
+            this.queuedMsg.push({type, hook, params, httpHeaders, promise: {resolve, reject}});
+          });
+          return p;
+        }
+        else {
+          this.queuedMsg.push({type, hook, params, httpHeaders});
+        }
+        return;
      }
      this.connectInProgress = true;
      this.logger.debug(`WsRequestor:request(${this.id}) - connecting since we do not have a connection for ${type}`);
@@ -111,10 +102,6 @@ class WsRequestor extends BaseRequestor {
        return Promise.reject(err);
      }
    }
-    // If jambonz wait for ack from reconnect, queue the msg until reconnect is acked
-    if (type !== 'session:reconnect' && this._reconnectPromise) {
-      return queueMsg();
-    }
    assert(this.ws);

    /* prepare and send message */
@@ -132,7 +119,7 @@ class WsRequestor extends BaseRequestor {
      type,
      msgid,
      call_sid: this.call_sid,
-      hook: ['verb:hook', 'session:redirect'].includes(type) ? url : undefined,
+      hook: type === 'verb:hook' ? url : undefined,
      data: {...payload},
      ...b3
    };
@@ -152,18 +139,6 @@ class WsRequestor extends BaseRequestor {
      }
    };

-    const rejectQueuedMsgs = (err) => {
-      if (this.queuedMsg.length > 0) {
-        for (const {promise} of this.queuedMsg) {
-          this.logger.debug(`WsRequestor:request - preparing queued ${type} for rejectQueuedMsgs`);
-          if (promise) {
-            promise.reject(err);
-          }
-        }
-        this.queuedMsg.length = 0;
-      }
-    };
-
    //this.logger.debug({obj}, `websocket: sending (${url})`);

    /* special case: reconnecting before we received ack to session:new */
@@ -204,37 +179,16 @@ class WsRequestor extends BaseRequestor {
          this.logger.debug({response}, `WsRequestor:request ${url} succeeded in ${rtt}ms`);
          this.stats.histogram('app.hook.ws_response_time', rtt, ['hook_type:app']);
          resolve(response);
-          if (this._reconnectResolve) {
-            this._reconnectResolve();
-          }
        },
        failure: (err) => {
-          if (this._reconnectReject) {
-            this._reconnectReject(err);
-          }
          clearTimeout(timer);
          reject(err);
        }
      });

      /* send the message */
-      this.ws.send(JSON.stringify(obj), async() => {
+      this.ws.send(JSON.stringify(obj), () => {
        this.logger.debug({obj}, `WsRequestor:request websocket: sent (${url})`);
-        // If session:reconnect is waiting for ack, hold here until ack to send queuedMsgs
-        if (this._reconnectPromise) {
-          try {
-            await this._reconnectPromise;
-          } catch (err) {
-            // bad thing happened to session:recconnect
-            rejectQueuedMsgs(err);
-            this.emit('reconnect-error');
-            return;
-          } finally {
-            this._reconnectPromise = null;
-            this._reconnectResolve = null;
-            this._reconnectReject = null;
-          }
-        }
        sendQueuedMsgs();
      });
    });
@@ -392,9 +346,7 @@ class WsRequestor extends BaseRequestor {
    /* messages must be JSON format */
    try {
      const obj = JSON.parse(content);
-      //const {type, msgid, command, call_sid = this.call_sid, queueCommand = false, data} = obj;
-      const {type, msgid, command, queueCommand = false, data} = obj;
-      const call_sid = obj.callSid || this.call_sid;
+      const {type, msgid, command, call_sid = this.call_sid, queueCommand = false, data} = obj;

      //this.logger.debug({obj}, 'WsRequestor:request websocket: received');
      assert.ok(type, 'type property not supplied');
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "jambonz-feature-server",
-  "version": "0.9.0",
+  "version": "0.8.6",
  "main": "app.js",
  "engines": {
    "node": ">= 18.x"
@@ -25,57 +25,57 @@
    "jslint:fix": "eslint app.js tracer.js lib --fix"
  },
  "dependencies": {
-    "@aws-sdk/client-auto-scaling": "^3.549.0",
-    "@aws-sdk/client-sns": "^3.549.0",
+    "@aws-sdk/client-auto-scaling": "^3.360.0",
+    "@aws-sdk/client-sns": "^3.360.0",
    "@jambonz/db-helpers": "^0.9.3",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/mw-registrar": "^0.2.7",
-    "@jambonz/realtimedb-helpers": "^0.8.8",
-    "@jambonz/speech-utils": "^0.1.3",
-    "@jambonz/stats-collector": "^0.1.10",
+    "@jambonz/mw-registrar": "^0.2.4",
+    "@jambonz/realtimedb-helpers": "^0.8.7",
+    "@jambonz/speech-utils": "^0.0.44",
+    "@jambonz/stats-collector": "^0.1.9",
    "@jambonz/time-series": "^0.2.8",
-    "@jambonz/verb-specifications": "^0.0.72",
-    "@opentelemetry/api": "^1.8.0",
-    "@opentelemetry/exporter-jaeger": "^1.23.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.50.0",
-    "@opentelemetry/exporter-zipkin": "^1.23.0",
-    "@opentelemetry/instrumentation": "^0.50.0",
-    "@opentelemetry/resources": "^1.23.0",
-    "@opentelemetry/sdk-trace-base": "^1.23.0",
-    "@opentelemetry/sdk-trace-node": "^1.23.0",
-    "@opentelemetry/semantic-conventions": "^1.23.0",
+    "@jambonz/verb-specifications": "^0.0.64",
+    "@opentelemetry/api": "^1.4.0",
+    "@opentelemetry/exporter-jaeger": "^1.9.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.35.0",
+    "@opentelemetry/exporter-zipkin": "^1.9.0",
+    "@opentelemetry/instrumentation": "^0.35.0",
+    "@opentelemetry/resources": "^1.9.0",
+    "@opentelemetry/sdk-trace-base": "^1.9.0",
+    "@opentelemetry/sdk-trace-node": "^1.9.0",
+    "@opentelemetry/semantic-conventions": "^1.9.0",
    "bent": "^7.3.12",
    "debug": "^4.3.4",
    "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^3.0.43",
-    "drachtio-srf": "^4.5.35",
+    "drachtio-fsmrf": "^3.0.39",
+    "drachtio-srf": "^4.5.31",
    "express": "^4.19.2",
    "express-validator": "^7.0.1",
-    "ip": "^2.0.1",
-    "moment": "^2.30.1",
-    "parse-url": "^9.2.0",
-    "pino": "^8.20.0",
+    "ip": "^1.1.9",
+    "moment": "^2.29.4",
+    "parse-url": "^8.1.0",
+    "pino": "^8.8.0",
    "polly-ssml-split": "^0.1.0",
    "proxyquire": "^2.1.3",
-    "sdp-transform": "^2.14.2",
-    "short-uuid": "^5.1.0",
-    "sinon": "^17.0.1",
+    "sdp-transform": "^2.14.1",
+    "short-uuid": "^4.2.2",
+    "sinon": "^15.0.1",
    "to-snake-case": "^1.0.0",
-    "undici": "^6.15.0",
+    "undici": "^5.28.3",
    "uuid-random": "^1.3.2",
    "verify-aws-sns-signature": "^0.1.0",
-    "ws": "^8.17.0",
+    "ws": "^8.9.0",
    "xml2js": "^0.6.2"
  },
  "devDependencies": {
    "clear-module": "^4.1.2",
-    "eslint": "7.32.0",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint": "^7.32.0",
+    "eslint-plugin-promise": "^4.3.1",
    "nyc": "^15.1.0",
-    "tape": "^5.7.5"
+    "tape": "^5.6.1"
  },
  "optionalDependencies": {
-    "bufferutil": "^4.0.8",
-    "utf-8-validate": "^6.0.3"
+    "bufferutil": "^4.0.6",
+    "utf-8-validate": "^5.0.8"
  }
 }
--- a/test/docker-compose-testbed.yaml
+++ b/test/docker-compose-testbed.yaml
@@ -57,7 +57,7 @@ services:
        condition: service_healthy

  freeswitch:
-    image: drachtio/drachtio-freeswitch-mrf:0.7.3
+    image: drachtio/drachtio-freeswitch-mrf:0.6.2
    restart: always
    command: freeswitch --rtp-range-start 20000 --rtp-range-end 20100
    environment: