further refinement

improve deprecated syntax
2026-01-25 02:07:56 +00:00 · 2023-04-10 09:27:28 -04:00 · 2023-04-10 09:20:49 -04:00 · 2023-04-10 09:12:41 -04:00 · 2023-04-10 09:08:54 -04:00 · 2023-04-10 09:02:39 -04:00
69 changed files with 3701 additions and 9507 deletions
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -2,8 +2,6 @@ name: Docker

 on:
  push:
-    branches:
-      - main
    tags:
      - '*'

@@ -20,7 +18,7 @@ jobs:
      - name: prepare tag 
        id: prepare_tag
        run: |
-            IMAGE_ID=jambonz/feature-server
+            IMAGE_ID=$GITHUB_REPOSITORY

            # Strip git ref prefix from version
            VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:18.15-alpine3.16 as base
+FROM --platform=linux/amd64 node:18.14.1-alpine3.16 as base

 RUN apk --update --no-cache add --virtual .builds-deps build-base python3

--- a/README.md
+++ b/README.md
@@ -89,4 +89,4 @@ module.exports = {

 #### Running the test suite

-Please [see this](./docs/contributing.md#run-the-regression-test-suite).
+Please [see this]](./docs/contributing.md#run-the-regression-test-suite).
--- a/app.js
+++ b/app.js
@@ -1,28 +1,22 @@
-const {
-  DRACHTIO_PORT,
-  DRACHTIO_HOST,
-  DRACHTIO_SECRET,
-  JAMBONES_OTEL_SERVICE_NAME,
-  JAMBONES_LOGLEVEL,
-  JAMBONES_CLUSTER_ID,
-  JAMBONZ_CLEANUP_INTERVAL_MINS,
-  getCleanupIntervalMins,
-  K8S,
-  NODE_ENV,
-  checkEnvs,
-} = require('./lib/config');
-
-checkEnvs();
+const assert = require('assert');
+assert.ok(process.env.JAMBONES_MYSQL_HOST &&
+  process.env.JAMBONES_MYSQL_USER &&
+  process.env.JAMBONES_MYSQL_PASSWORD &&
+  process.env.JAMBONES_MYSQL_DATABASE, 'missing JAMBONES_MYSQL_XXX env vars');
+assert.ok(process.env.DRACHTIO_PORT || process.env.DRACHTIO_HOST, 'missing DRACHTIO_PORT env var');
+assert.ok(process.env.DRACHTIO_SECRET, 'missing DRACHTIO_SECRET env var');
+assert.ok(process.env.JAMBONES_FREESWITCH, 'missing JAMBONES_FREESWITCH env var');
+assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
+assert.ok(process.env.JAMBONES_NETWORK_CIDR || process.env.K8S, 'missing JAMBONES_SUBNET env var');
+assert.ok(process.env.ENCRYPTION_SECRET || process.env.JWT_SECRET, 'missing ENCRYPTION_SECRET env var');

 const Srf = require('drachtio-srf');
 const srf = new Srf();
-const tracer = require('./tracer')(JAMBONES_OTEL_SERVICE_NAME);
+const tracer = require('./tracer')(process.env.JAMBONES_OTEL_SERVICE_NAME || 'jambonz-feature-server');
 const api = require('@opentelemetry/api');
 srf.locals = {...srf.locals, otel: {tracer, api}};

-const opts = {
-  level: JAMBONES_LOGLEVEL
-};
+const opts = {level: process.env.JAMBONES_LOGLEVEL || 'info'};
 const pino = require('pino');
 const logger = pino(opts, pino.destination({sync: false}));
 const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./lib/utils/constants');
@@ -42,8 +36,8 @@ const {
 const InboundCallSession = require('./lib/session/inbound-call-session');
 const SipRecCallSession = require('./lib/session/siprec-call-session');

-if (DRACHTIO_HOST) {
-  srf.connect({host: DRACHTIO_HOST, port: DRACHTIO_PORT, secret: DRACHTIO_SECRET });
+if (process.env.DRACHTIO_HOST) {
+  srf.connect({host: process.env.DRACHTIO_HOST, port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET });
  srf.on('connect', (err, hp) => {
    const arr = /^(.*)\/(.*)$/.exec(hp.split(',').pop());
    srf.locals.localSipAddress = `${arr[2]}`;
@@ -51,10 +45,10 @@ if (DRACHTIO_HOST) {
  });
 }
 else {
-  logger.info(`listening for drachtio requests on port ${DRACHTIO_PORT}`);
-  srf.listen({port: DRACHTIO_PORT, secret: DRACHTIO_SECRET});
+  logger.info(`listening for drachtio requests on port ${process.env.DRACHTIO_PORT}`);
+  srf.listen({port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET});
 }
-if (NODE_ENV === 'test') {
+if (process.env.NODE_ENV === 'test') {
  srf.on('error', (err) => {
    logger.info(err, 'Error connecting to drachtio');
  });
@@ -119,18 +113,13 @@ function handle(signal) {
  const {removeFromSet} = srf.locals.dbHelpers;
  srf.locals.disabled = true;
  logger.info(`got signal ${signal}`);
-  const setName = `${(JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
-  const fsServiceUrlSetName = `${(JAMBONES_CLUSTER_ID || 'default')}:fs-service-url`;
+  const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
  if (setName && srf.locals.localSipAddress) {
    logger.info(`got signal ${signal}, removing ${srf.locals.localSipAddress} from set ${setName}`);
    removeFromSet(setName, srf.locals.localSipAddress);
  }
-  if (fsServiceUrlSetName && srf.locals.serviceUrl) {
-    logger.info(`got signal ${signal}, removing ${srf.locals.serviceUrl} from set ${fsServiceUrlSetName}`);
-    removeFromSet(fsServiceUrlSetName, srf.locals.serviceUrl);
-  }
  removeFromSet(FS_UUID_SET_NAME, srf.locals.fsUUID);
-  if (K8S) {
+  if (process.env.K8S) {
    srf.locals.lifecycleEmitter.operationalState = LifeCycleEvents.ScaleIn;
  }
  if (getCount() === 0) {
@@ -139,7 +128,7 @@ function handle(signal) {
  }
 }

-if (JAMBONZ_CLEANUP_INTERVAL_MINS) {
+if (process.env.JAMBONZ_CLEANUP_INTERVAL_MINS) {
  const {clearFiles} = require('./lib/utils/cron-jobs');

  /* cleanup orphaned files or channels every so often */
@@ -149,7 +138,7 @@ if (JAMBONZ_CLEANUP_INTERVAL_MINS) {
    } catch (err) {
      logger.error({err}, 'app.js: error clearing files');
    }
-  }, getCleanupIntervalMins());
+  }, 1000 * 60 * (process.env.JAMBONZ_CLEANUP_INTERVAL_MINS || 60));
 }

 module.exports = {srf, logger, disconnect};
--- a/bin/k8s-pre-stop-hook.js
+++ b/bin/k8s-pre-stop-hook.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 const bent = require('bent');
 const getJSON = bent('json');
-const {PORT} = require('../lib/config')
+const PORT = process.env.HTTP_PORT || 3000;

 const sleep = (ms) => {
  return new Promise((resolve) => setTimeout(resolve, ms));
--- a/data/example-voicemail-greetings.json
+++ b/data/example-voicemail-greetings.json
@@ -5,11 +5,14 @@
    "at the tone",
    "leave a message",
    "leave me a message",
-    "not available",
+    "not available right now",
+    "not available to take your call",
    "can't take your call",
-    "will get back to you",
+    "I will get back to you",
    "I'll get back to you",
-    "we are unable"
+    "we will get back to you",
+    "we are unable",
+    "we are not available"
  ],
  "es-ES": [
    "le pasamos la llamada",
@@ -45,18 +48,5 @@
    "ens posarem en contacto",
    "ara no estem disponibles",
    "no hi som"
-  ],
-  "de-DE": [
-    "nicht erreichbar",
-    "nnruf wurde weitergeleitet",
-    "beim piepsen",
-    "am ton",
-    "eine nachricht hinterlassen",
-    "hinterlasse mir eine Nachricht",
-    "nicht verfügbar",
-    "kann ihren anruf nicht entgegennehmen",
-    "wird sich bei Ihnen melden",
-    "ich melde mich bei dir",
-    "wir können nicht"
  ]
 }
--- a/lib/config.js
+++ b/lib/config.js
@@ -1,229 +0,0 @@
-const assert = require('assert');
-
-const checkEnvs = () => {
-  assert.ok(process.env.JAMBONES_MYSQL_HOST &&
-		process.env.JAMBONES_MYSQL_USER &&
-		process.env.JAMBONES_MYSQL_PASSWORD &&
-		process.env.JAMBONES_MYSQL_DATABASE, 'missing JAMBONES_MYSQL_XXX env vars');
-  assert.ok(process.env.DRACHTIO_PORT || process.env.DRACHTIO_HOST, 'missing DRACHTIO_PORT env var');
-  assert.ok(process.env.DRACHTIO_SECRET, 'missing DRACHTIO_SECRET env var');
-  assert.ok(process.env.JAMBONES_FREESWITCH, 'missing JAMBONES_FREESWITCH env var');
-  if (process.env.JAMBONES_REDIS_SENTINELS) {
-    assert.ok(process.env.JAMBONES_REDIS_SENTINEL_MASTER_NAME,
-      'missing JAMBONES_REDIS_SENTINEL_MASTER_NAME env var, JAMBONES_REDIS_SENTINEL_PASSWORD env var is optional');
-  } else {
-    assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
-  }
-  assert.ok(process.env.JAMBONES_NETWORK_CIDR || process.env.K8S, 'missing JAMBONES_SUBNET env var');
-};
-
-const NODE_ENV = process.env.NODE_ENV;
-
-/* database mySQL */
-const JAMBONES_MYSQL_HOST = process.env.JAMBONES_MYSQL_HOST;
-const JAMBONES_MYSQL_USER = process.env.JAMBONES_MYSQL_USER;
-const JAMBONES_MYSQL_PASSWORD = process.env.JAMBONES_MYSQL_PASSWORD;
-const JAMBONES_MYSQL_DATABASE = process.env.JAMBONES_MYSQL_DATABASE;
-const JAMBONES_MYSQL_PORT = parseInt(process.env.JAMBONES_MYSQL_PORT, 10) || 3306;
-const JAMBONES_MYSQL_REFRESH_TTL = parseInt(process.env.JAMBONES_MYSQL_REFRESH_TTL, 10) || 0;
-const JAMBONES_MYSQL_CONNECTION_LIMIT = parseInt(process.env.JAMBONES_MYSQL_CONNECTION_LIMIT, 10) || 10;
-
-/* redis */
-const JAMBONES_REDIS_HOST = process.env.JAMBONES_REDIS_HOST;
-const JAMBONES_REDIS_PORT = parseInt(process.env.JAMBONES_REDIS_PORT, 10) || 6379;
-
-/* gather and hints */
-const JAMBONES_GATHER_EARLY_HINTS_MATCH = process.env.JAMBONES_GATHER_EARLY_HINTS_MATCH;
-const JAMBONZ_GATHER_EARLY_HINTS_MATCH = process.env.JAMBONZ_GATHER_EARLY_HINTS_MATCH;
-const JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS = process.env.JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS;
-
-const SMPP_URL = process.env.SMPP_URL;
-
-/* drachtio */
-const DRACHTIO_PORT = process.env.DRACHTIO_PORT;
-const DRACHTIO_HOST = process.env.DRACHTIO_HOST;
-const DRACHTIO_SECRET = process.env.DRACHTIO_SECRET;
-
-/* freeswitch */
-const JAMBONES_API_BASE_URL = process.env.JAMBONES_API_BASE_URL;
-const JAMBONES_FREESWITCH = process.env.JAMBONES_FREESWITCH;
-const JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS = parseInt(process.env.JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS, 10)
-	|| 180;
-
-
-const JAMBONES_SBCS = process.env.JAMBONES_SBCS;
-
-/* websockets */
-const JAMBONES_WS_HANDSHAKE_TIMEOUT_MS = parseInt(process.env.JAMBONES_WS_HANDSHAKE_TIMEOUT_MS, 10) || 1500;
-const JAMBONES_WS_MAX_PAYLOAD = parseInt(process.env.JAMBONES_WS_MAX_PAYLOAD, 10) || 24 * 1024;
-const JAMBONES_WS_PING_INTERVAL_MS = parseInt(process.env.JAMBONES_WS_PING_INTERVAL_MS, 10) || 0;
-const MAX_RECONNECTS = 5;
-const RESPONSE_TIMEOUT_MS = parseInt(process.env.JAMBONES_WS_API_MSG_RESPONSE_TIMEOUT, 10) || 5000;
-
-const JAMBONES_NETWORK_CIDR = process.env.JAMBONES_NETWORK_CIDR;
-const JAMBONES_TIME_SERIES_HOST = process.env.JAMBONES_TIME_SERIES_HOST;
-const JAMBONES_CLUSTER_ID = process.env.JAMBONES_CLUSTER_ID || 'default';
-const JAMBONES_ESL_LISTEN_ADDRESS = process.env.JAMBONES_ESL_LISTEN_ADDRESS;
-
-/* tracing */
-const JAMBONES_OTEL_ENABLED = process.env.JAMBONES_OTEL_ENABLED;
-const JAMBONES_OTEL_SERVICE_NAME = process.env.JAMBONES_OTEL_SERVICE_NAME || 'jambonz-feature-server';
-const OTEL_EXPORTER_JAEGER_AGENT_HOST = process.env.OTEL_EXPORTER_JAEGER_AGENT_HOST;
-const OTEL_EXPORTER_JAEGER_ENDPOINT = process.env.OTEL_EXPORTER_JAEGER_ENDPOINT;
-const OTEL_EXPORTER_ZIPKIN_URL = process.env.OTEL_EXPORTER_ZIPKIN_URL;
-const OTEL_EXPORTER_COLLECTOR_URL = process.env.OTEL_EXPORTER_COLLECTOR_URL;
-
-const JAMBONES_LOGLEVEL = process.env.JAMBONES_LOGLEVEL || 'info';
-const JAMBONES_INJECT_CONTENT = process.env.JAMBONES_INJECT_CONTENT;
-
-const PORT = parseInt(process.env.HTTP_PORT, 10) || 3000;
-const HTTP_PORT_MAX = parseInt(process.env.HTTP_PORT_MAX, 10);
-
-const K8S = process.env.K8S;
-const K8S_SBC_SIP_SERVICE_NAME = process.env.K8S_SBC_SIP_SERVICE_NAME;
-
-const JAMBONES_SUBNET = process.env.JAMBONES_SUBNET;
-
-/* clean up */
-const JAMBONZ_CLEANUP_INTERVAL_MINS = process.env.JAMBONZ_CLEANUP_INTERVAL_MINS;
-const getCleanupIntervalMins = () => {
-  const interval = parseInt(JAMBONZ_CLEANUP_INTERVAL_MINS, 10) || 60;
-  return 1000 * 60 * interval;
-};
-
-/* speech vendors */
-const AWS_REGION = process.env.AWS_REGION;
-const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID;
-const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
-const AWS_SNS_PORT = parseInt(process.env.AWS_SNS_PORT, 10) || 3001;
-const AWS_SNS_TOPIC_ARM = process.env.AWS_SNS_TOPIC_ARM;
-const AWS_SNS_PORT_MAX = parseInt(process.env.AWS_SNS_PORT_MAX, 10) || 3005;
-
-const GCP_JSON_KEY = process.env.GCP_JSON_KEY;
-
-const MICROSOFT_REGION = process.env.MICROSOFT_REGION;
-const MICROSOFT_API_KEY = process.env.MICROSOFT_API_KEY;
-
-const SONIOX_API_KEY = process.env.SONIOX_API_KEY;
-
-const DEEPGRAM_API_KEY = process.env.DEEPGRAM_API_KEY;
-
-const ANCHOR_MEDIA_ALWAYS = process.env.ANCHOR_MEDIA_ALWAYS;
-const VMD_HINTS_FILE = process.env.VMD_HINTS_FILE;
-
-/* security, secrets */
-const LEGACY_CRYPTO = !!process.env.LEGACY_CRYPTO;
-const JWT_SECRET = process.env.JWT_SECRET;
-const ENCRYPTION_SECRET = process.env.ENCRYPTION_SECRET;
-
-/* HTTP/1 pool dispatcher */
-const HTTP_POOL = process.env.HTTP_POOL && parseInt(process.env.HTTP_POOL);
-const HTTP_POOLSIZE = parseInt(process.env.HTTP_POOLSIZE, 10) || 10;
-const HTTP_PIPELINING = parseInt(process.env.HTTP_PIPELINING, 10) || 1;
-const HTTP_TIMEOUT = 10000;
-
-const OPTIONS_PING_INTERVAL = parseInt(process.env.OPTIONS_PING_INTERVAL, 10) || 30000;
-
-const JAMBONES_REDIS_SENTINELS = process.env.JAMBONES_REDIS_SENTINELS ? {
-  sentinels: process.env.JAMBONES_REDIS_SENTINELS.split(',').map((sentinel) => {
-    let host, port = 26379;
-    if (sentinel.includes(':')) {
-      const arr = sentinel.split(':');
-      host = arr[0];
-      port = parseInt(arr[1], 10);
-    } else {
-      host = sentinel;
-    }
-    return {host, port};
-  }),
-  name: process.env.JAMBONES_REDIS_SENTINEL_MASTER_NAME,
-  ...(process.env.JAMBONES_REDIS_SENTINEL_PASSWORD && {
-    password: process.env.JAMBONES_REDIS_SENTINEL_PASSWORD
-  }),
-  ...(process.env.JAMBONES_REDIS_SENTINEL_USERNAME && {
-    username: process.env.JAMBONES_REDIS_SENTINEL_USERNAME
-  })
-} : null;
-const JAMBONZ_RECORD_WS_BASE_URL = process.env.JAMBONZ_RECORD_WS_BASE_URL;
-const JAMBONZ_RECORD_WS_USERNAME = process.env.JAMBONZ_RECORD_WS_USERNAME;
-const JAMBONZ_RECORD_WS_PASSWORD = process.env.JAMBONZ_RECORD_WS_PASSWORD;
-
-module.exports = {
-  JAMBONES_MYSQL_HOST,
-  JAMBONES_MYSQL_USER,
-  JAMBONES_MYSQL_PASSWORD,
-  JAMBONES_MYSQL_DATABASE,
-  JAMBONES_MYSQL_REFRESH_TTL,
-  JAMBONES_MYSQL_CONNECTION_LIMIT,
-  JAMBONES_MYSQL_PORT,
-
-  DRACHTIO_PORT,
-  DRACHTIO_HOST,
-  DRACHTIO_SECRET,
-
-  JAMBONES_GATHER_EARLY_HINTS_MATCH,
-  JAMBONZ_GATHER_EARLY_HINTS_MATCH,
-  JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS,
-  JAMBONES_FREESWITCH,
-  JAMBONES_REDIS_HOST,
-  JAMBONES_REDIS_PORT,
-  JAMBONES_REDIS_SENTINELS,
-  SMPP_URL,
-  JAMBONES_NETWORK_CIDR,
-  JAMBONES_API_BASE_URL,
-  JAMBONES_TIME_SERIES_HOST,
-  JAMBONES_INJECT_CONTENT,
-  JAMBONES_ESL_LISTEN_ADDRESS,
-  JAMBONES_SBCS,
-  JAMBONES_OTEL_ENABLED,
-  JAMBONES_OTEL_SERVICE_NAME,
-  OTEL_EXPORTER_JAEGER_AGENT_HOST,
-  OTEL_EXPORTER_JAEGER_ENDPOINT,
-  OTEL_EXPORTER_ZIPKIN_URL,
-  OTEL_EXPORTER_COLLECTOR_URL,
-
-  JAMBONES_LOGLEVEL,
-  JAMBONES_CLUSTER_ID,
-  PORT,
-  HTTP_PORT_MAX,
-  K8S,
-  K8S_SBC_SIP_SERVICE_NAME,
-  JAMBONES_SUBNET,
-  NODE_ENV,
-  JAMBONZ_CLEANUP_INTERVAL_MINS,
-  getCleanupIntervalMins,
-  checkEnvs,
-
-  AWS_REGION,
-  AWS_ACCESS_KEY_ID,
-  AWS_SECRET_ACCESS_KEY,
-  AWS_SNS_PORT,
-  AWS_SNS_TOPIC_ARM,
-  AWS_SNS_PORT_MAX,
-
-  ANCHOR_MEDIA_ALWAYS,
-  VMD_HINTS_FILE,
-  JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS,
-
-  LEGACY_CRYPTO,
-  JWT_SECRET,
-  ENCRYPTION_SECRET,
-  HTTP_POOL,
-  HTTP_POOLSIZE,
-  HTTP_PIPELINING,
-  HTTP_TIMEOUT,
-  OPTIONS_PING_INTERVAL,
-  RESPONSE_TIMEOUT_MS,
-  JAMBONES_WS_HANDSHAKE_TIMEOUT_MS,
-  JAMBONES_WS_MAX_PAYLOAD,
-  JAMBONES_WS_PING_INTERVAL_MS,
-  MAX_RECONNECTS,
-  GCP_JSON_KEY,
-  MICROSOFT_REGION,
-  MICROSOFT_API_KEY,
-  SONIOX_API_KEY,
-  DEEPGRAM_API_KEY,
-  JAMBONZ_RECORD_WS_BASE_URL,
-  JAMBONZ_RECORD_WS_USERNAME,
-  JAMBONZ_RECORD_WS_PASSWORD
-};
--- a/lib/http-routes/api/create-call.js
+++ b/lib/http-routes/api/create-call.js
@@ -19,23 +19,14 @@ router.post('/', async(req, res) => {
  logger.debug({body: req.body}, 'got createCall request');
  try {
    let uri, cs, to;
-    // app_json is creaeted by only api-server.
-    // if it available, take it and delete before creating task
-    const app_json = req.body.app_json;
-    delete req.body.app_json;
    const restDial = makeTask(logger, {'rest:dial': req.body});
-    restDial.appJson = app_json;
-    const {lookupAccountDetails, lookupCarrierByPhoneNumber, lookupCarrier} = dbUtils(logger, srf);
-    const {
-      lookupAppBySid
-    }  = srf.locals.dbHelpers;
+    const {lookupAccountDetails} = dbUtils(logger, srf);
    const {getSBC, getFreeswitch} = srf.locals;
    const sbcAddress = getSBC();
    if (!sbcAddress) throw new Error('no available SBCs for outbound call creation');
    const target = restDial.to;
    const opts = {
      callingNumber: restDial.from,
-      ...(restDial.callerName && {callingName: restDial.callerName}),
      headers: req.body.headers || {}
    };

@@ -44,14 +35,6 @@ router.post('/', async(req, res) => {
    const account = await lookupAccountBySid(req.body.account_sid);
    const accountInfo = await lookupAccountDetails(req.body.account_sid);
    const callSid = uuidv4();
-    const application = req.body.application_sid ? await lookupAppBySid(req.body.application_sid) : null;
-    const record_all_calls = account.record_all_calls || (application && application.record_all_calls);
-    const recordOutputFormat = account.record_format || 'mp3';
-    const rootSpan = new RootSpan('rest-call', {
-      callSid,
-      accountSid,
-      ...(req.body?.application_sid && {'X-Application-Sid': req.body.application_sid})
-    });

    opts.headers = {
      ...opts.headers,
@@ -59,10 +42,7 @@ router.post('/', async(req, res) => {
      'X-Jambonz-FS-UUID': srf.locals.fsUUID,
      'X-Call-Sid': callSid,
      'X-Account-Sid': accountSid,
-      'X-Trace-ID': rootSpan.traceId,
-      ...(req.body?.application_sid && {'X-Application-Sid': req.body.application_sid}),
-      ...(restDial.fromHost && {'X-Preferred-From-Host': restDial.fromHost}),
-      ...(record_all_calls && {'X-Record-All-Calls': recordOutputFormat})
+      ...(restDial.fromHost && {'X-Preferred-From-Host': restDial.fromHost})
    };

    switch (target.type) {
@@ -96,6 +76,7 @@ router.post('/', async(req, res) => {
    }

    if (target.type === 'phone' && target.trunk) {
+      const {lookupCarrier} = dbUtils(this.logger, srf);
      const voip_carrier_sid = await lookupCarrier(req.body.account_sid, target.trunk);
      logger.info(
        `createCall: selected ${voip_carrier_sid} for requested carrier: ${target.trunk || 'unspecified'})`);
@@ -104,21 +85,6 @@ router.post('/', async(req, res) => {
      }
    }

-    /**
-     * trunk isn't specified,
-     * check if from-number matches any existing numbers on Jambonz
-     *  */
-    if (target.type === 'phone' && !target.trunk) {
-      const str = restDial.from || '';
-      const callingNumber = str.startsWith('+') ? str.substring(1) : str;
-      const voip_carrier_sid = await lookupCarrierByPhoneNumber(req.body.account_sid, callingNumber);
-      logger.info(
-        `createCall: selected ${voip_carrier_sid} for requested phone number: ${callingNumber || 'unspecified'})`);
-      if (voip_carrier_sid) {
-        opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
-      }
-    }
-
    /* create endpoint for outdial */
    const ms = getFreeswitch();
    if (!ms) throw new Error('no available Freeswitch for outbound call creation');
@@ -200,6 +166,7 @@ router.post('/', async(req, res) => {
          /* ok our outbound INVITE is in flight */

          const tasks = [restDial];
+          const rootSpan = new RootSpan('rest-call', inviteReq);
          sipLogger = logger.child({
            callSid,
            callId: inviteReq.get('Call-ID'),
@@ -263,7 +230,6 @@ router.post('/', async(req, res) => {
          sipStatus: err.status,
          sipReason: err.reason
        });
-        cs.callGone = true;
      }
      else {
        if (cs) cs.emit('callStatusChange', {
--- a/lib/http-routes/api/update-call.js
+++ b/lib/http-routes/api/update-call.js
@@ -9,29 +9,25 @@ const {CallStatus, CallDirection} = require('../../utils/constants');
 */
 function retrieveCallSession(callSid, opts) {
  if (opts.call_status_hook && !opts.call_hook) {
-    throw new DbErrorBadRequest(
-      `call_status_hook can be updated only when call_hook is also being updated for call_sid ${callSid}`);
+    throw new DbErrorBadRequest('call_status_hook can be updated only when call_hook is also being updated');
  }
  const cs = sessionTracker.get(callSid);
  if (!cs) {
-    throw new DbErrorUnprocessableRequest(`call session is gone for call_sid ${callSid}`);
+    throw new DbErrorUnprocessableRequest('call session is gone');
  }

  if (opts.call_status === CallStatus.Completed && !cs.hasStableDialog) {
-    throw new DbErrorUnprocessableRequest(
-      `current call state is incompatible with requested action for call_sid ${callSid}`);
+    throw new DbErrorUnprocessableRequest('current call state is incompatible with requested action');
  }
  else if (opts.call_status === CallStatus.NoAnswer) {
    if (cs.direction === CallDirection.Outbound) {
      if (!cs.isOutboundCallRinging) {
-        throw new DbErrorUnprocessableRequest(
-          `current call state is incompatible with requested action for call_sid ${callSid}`);
+        throw new DbErrorUnprocessableRequest('current call state is incompatible with requested action');
      }
    }
    else {
      if (cs.isInboundCallAnswered) {
-        throw new DbErrorUnprocessableRequest(
-          `current call state is incompatible with requested action for call_sid ${callSid}`);
+        throw new DbErrorUnprocessableRequest('current call state is incompatible with requested action');
      }
    }
  }
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -10,9 +10,6 @@ const { normalizeJambones }  = require('@jambonz/verb-specifications');
 const dbUtils = require('./utils/db-utils');
 const RootSpan = require('./utils/call-tracer');
 const listTaskNames = require('./utils/summarize-tasks');
-const {
-  JAMBONES_MYSQL_REFRESH_TTL
-} = require('./config');

 module.exports = function(srf, logger) {
  const {
@@ -245,12 +242,11 @@ module.exports = function(srf, logger) {
      */

      /* allow for caching data - when caching treat retrieved data as immutable */
-      const app2 = JAMBONES_MYSQL_REFRESH_TTL ? JSON.parse(JSON.stringify(app)) : app;
+      const app2 = process.env.JAMBONES_MYSQL_REFRESH_TTL ? JSON.parse(JSON.stringify(app)) : app;
      if ('WS' === app.call_hook?.method ||
        app.call_hook?.url.startsWith('ws://') || app.call_hook?.url.startsWith('wss://')) {
-        const requestor = new WsRequestor(logger, account_sid, app.call_hook, accountInfo.account.webhook_secret) ;
-        app2.requestor = requestor;
-        app2.notifier = requestor;
+        app2.requestor = new WsRequestor(logger, account_sid, app.call_hook, accountInfo.account.webhook_secret) ;
+        app2.notifier = app.requestor;
        app2.call_hook.method = 'WS';
      }
      else {
@@ -289,7 +285,7 @@ module.exports = function(srf, logger) {
    const {rootSpan, siprec, application:app} = req.locals;
    let span;
    try {
-      if (app.tasks && !JAMBONES_MYSQL_REFRESH_TTL) {
+      if (app.tasks && !process.env.JAMBONES_MYSQL_REFRESH_TTL) {
        app.tasks = normalizeJambones(logger, app.tasks).map((tdata) => makeTask(logger, tdata));
        if (0 === app.tasks.length) throw new Error('no application provided');
        return next();
@@ -322,7 +318,6 @@ module.exports = function(srf, logger) {
        const httpHeaders = b3 && { b3 };
        json = await app.requestor.request('session:new', app.call_hook, params, httpHeaders);
      }
-
      app.tasks = normalizeJambones(logger, json).map((tdata) => makeTask(logger, tdata));
      span?.setAttributes({
        'http.statusCode': 200,
--- a/lib/session/call-info.js
+++ b/lib/session/call-info.js
@@ -1,7 +1,6 @@
 const {CallDirection, CallStatus} = require('../utils/constants');
 const parseUri = require('drachtio-srf').parseUri;
 const uuidv4 = require('uuid-random');
-const {JAMBONES_API_BASE_URL} = require('../config');
 /**
 * @classdesc Represents the common information for all calls
 * that is provided in call status webhooks
@@ -41,13 +40,13 @@ class CallInfo {
        this.participants = [
          {
            participant: 'caller',
-            uriUser: caller?.user,
-            uriHost: caller?.host
+            uriUser: caller.user,
+            uriHost: caller.host
          },
          {
            participant: 'callee',
-            uriUser: callee?.user,
-            uriHost: callee?.host
+            uriUser: callee.user,
+            uriHost: callee.host
          }
        ];
      }
@@ -147,8 +146,8 @@ class CallInfo {
      Object.assign(obj, {customerData: this._customerData});
    }

-    if (JAMBONES_API_BASE_URL) {
-      Object.assign(obj, {apiBaseUrl: JAMBONES_API_BASE_URL});
+    if (process.env.JAMBONES_API_BASE_URL) {
+      Object.assign(obj, {apiBaseUrl: process.env.JAMBONES_API_BASE_URL});
    }
    if (this.publicIp) {
      Object.assign(obj, {fsPublicIp: this.publicIp});
--- a/lib/session/call-session.js
+++ b/lib/session/call-session.js
@@ -17,13 +17,6 @@ const { normalizeJambones } = require('@jambonz/verb-specifications');
 const listTaskNames = require('../utils/summarize-tasks');
 const HttpRequestor = require('../utils/http-requestor');
 const WsRequestor = require('../utils/ws-requestor');
-const {
-  JAMBONES_INJECT_CONTENT,
-  AWS_REGION,
-  JAMBONZ_RECORD_WS_BASE_URL,
-  JAMBONZ_RECORD_WS_USERNAME,
-  JAMBONZ_RECORD_WS_PASSWORD,
-} = require('../config');
 const BADPRECONDITIONS = 'preconditions not met';
 const CALLER_CANCELLED_ERR_MSG = 'Response not sent due to unknown transaction';

@@ -67,16 +60,6 @@ class CallSession extends Emitter {
    this.notifiedComplete = false;
    this.rootSpan = rootSpan;

-    this._origRecognizerSettings = {
-      vendor: this.application?.speech_recognizer_vendor,
-      language: this.application?.speech_recognizer_language,
-    };
-    this._origSynthesizerSettings = {
-      vendor: this.application?.speech_synthesis_vendor,
-      language: this.application?.speech_synthesis_language,
-      voice: this.application?.speech_synthesis_voice,
-    };
-
    assert(rootSpan);

    this._recordState = RecordState.RecordingOff;
@@ -135,11 +118,6 @@ class CallSession extends Emitter {
    return this.callInfo.callStatus;
  }

-  get isBackGroundListen() {
-    return !(this.backgroundListenTask === null ||
-    this.backgroundListenTask === undefined);
-  }
-
  /**
   * SIP call-id for the call
   */
@@ -179,30 +157,6 @@ class CallSession extends Emitter {
  set speechSynthesisVendor(vendor) {
    this.application.speech_synthesis_vendor = vendor;
  }
-
-  get fallbackSpeechSynthesisVendor() {
-    return this.application.fallback_speech_synthesis_vendor;
-  }
-  set fallbackSpeechSynthesisVendor(vendor) {
-    this.application.fallback_speech_synthesis_vendor = vendor;
-  }
-
-  /**
-   * default label to use for speech synthesis if not provided in the app
-   */
-  get speechSynthesisLabel() {
-    return this.application.speech_synthesis_label;
-  }
-  set speechSynthesisLabel(label) {
-    this.application.speech_synthesis_label = label;
-  }
-
-  get fallbackSpeechSynthesisLabel() {
-    return this.application.fallback_speech_synthesis_label;
-  }
-  set fallbackSpeechSynthesisLabel(label) {
-    this.application.fallback_speech_synthesis_label = label;
-  }
  /**
   * default voice to use for speech synthesis if not provided in the app
   */
@@ -212,13 +166,6 @@ class CallSession extends Emitter {
  set speechSynthesisVoice(voice) {
    this.application.speech_synthesis_voice = voice;
  }
-
-  get fallbackSpeechSynthesisVoice() {
-    return this.application.fallback_speech_synthesis_voice;
-  }
-  set fallbackSpeechSynthesisVoice(voice) {
-    this.application.fallback_speech_synthesis_voice = voice;
-  }
  /**
   * default language to use for speech synthesis if not provided in the app
   */
@@ -229,13 +176,6 @@ class CallSession extends Emitter {
    this.application.speech_synthesis_language = language;
  }

-  get fallbackSpeechSynthesisLanguage() {
-    return this.application.fallback_speech_synthesis_language;
-  }
-  set fallbackSpeechSynthesisLanguage(language) {
-    this.application.fallback_speech_synthesis_language = language;
-  }
-
  /**
   * default vendor to use for speech recognition if not provided in the app
   */
@@ -245,29 +185,6 @@ class CallSession extends Emitter {
  set speechRecognizerVendor(vendor) {
    this.application.speech_recognizer_vendor = vendor;
  }
-
-  get fallbackSpeechRecognizerVendor() {
-    return this.application.fallback_speech_recognizer_vendor;
-  }
-  set fallbackSpeechRecognizerVendor(vendor) {
-    this.application.fallback_speech_recognizer_vendor = vendor;
-  }
-  /**
-   * default vendor to use for speech recognition if not provided in the app
-   */
-  get speechRecognizerLabel() {
-    return this.application.speech_recognizer_label;
-  }
-  set speechRecognizerLabel(label) {
-    this.application.speech_recognizer_label = label;
-  }
-
-  get fallbackSpeechRecognizerLabel() {
-    return this.application.fallback_speech_recognizer_label;
-  }
-  set fallbackSpeechRecognizerLabel(label) {
-    this.application.fallback_speech_recognizer_label = label;
-  }
  /**
 * default language to use for speech recognition if not provided in the app
 */
@@ -278,13 +195,6 @@ class CallSession extends Emitter {
    this.application.speech_recognizer_language = language;
  }

-  get fallbackSpeechRecognizerLanguage() {
-    return this.application.fallback_speech_recognizer_language;
-  }
-  set fallbackSpeechRecognizerLanguage(language) {
-    this.application.fallback_speech_recognizer_language = language;
-  }
-
  /**
   * indicates whether the call currently in progress
   */
@@ -406,34 +316,10 @@ class CallSession extends Emitter {
    return this._globalSttPunctuation;
  }

-  get onHoldMusic() {
-    return this._onHoldMusic;
-  }
-
-  set onHoldMusic(url) {
-    this._onHoldMusic = url;
-  }
-
  hasGlobalSttPunctuation() {
    return this._globalSttPunctuation !== undefined;
  }

-  resetRecognizer() {
-    this._globalSttHints = undefined;
-    this._globalSttPunctuation = undefined;
-    this._globalAltLanguages = undefined;
-    this.isContinuousAsr = false;
-    this.asrDtmfTerminationDigits = undefined;
-    this.speechRecognizerLanguage = this._origRecognizerSettings.language;
-    this.speechRecognizerVendor = this._origRecognizerSettings.vendor;
-  }
-
-  resetSynthesizer() {
-    this.speechSynthesisLanguage = this._origSynthesizerSettings.language;
-    this.speechSynthesisVendor = this._origSynthesizerSettings.vendor;
-    this.speechSynthesisVoice = this._origSynthesizerSettings.voice;
-  }
-
  async notifyRecordOptions(opts) {
    const {action} = opts;
    this.logger.debug({opts}, 'CallSession:notifyRecordOptions');
@@ -499,10 +385,7 @@ class CallSession extends Emitter {
          'X-Call-Sid': this.callSid,
          'X-Account-Sid': this.accountSid,
          'X-Application-Sid': this.applicationSid,
-          ...(this.recordOptions.headers && {'Content-Type': 'application/json'})
-        },
-        // Siprect Client is initiated from startCallRecording, so just need to pass custom headers in startRecording
-        ...(this.recordOptions.headers && {body: JSON.stringify(this.recordOptions.headers) + '\n'})
+        }
      });
      if (res.status === 200) {
        this._recordState = RecordState.RecordingOn;
@@ -523,7 +406,7 @@ class CallSession extends Emitter {
      const res = await this.dlg.request({
        method: 'INFO',
        headers: {
-          'X-Reason': 'stopCallRecording'
+          'X-Reason': 'stopCallRecording',
        }
      });
      if (res.status === 200) {
@@ -545,7 +428,7 @@ class CallSession extends Emitter {
      const res = await this.dlg.request({
        method: 'INFO',
        headers: {
-          'X-Reason': 'pauseCallRecording'
+          'X-Reason': 'pauseCallRecording',
        }
      });
      if (res.status === 200) {
@@ -567,7 +450,7 @@ class CallSession extends Emitter {
      const res = await this.dlg.request({
        method: 'INFO',
        headers: {
-          'X-Reason': 'resumeCallRecording'
+          'X-Reason': 'resumeCallRecording',
        }
      });
      if (res.status === 200) {
@@ -582,7 +465,7 @@ class CallSession extends Emitter {
    }
  }

-  async startBackgroundListen(opts, bugname) {
+  async startBackgroundListen(opts) {
    if (this.isListenEnabled) {
      this.logger.info('CallSession:startBackgroundListen - listen is already enabled, ignoring request');
      return;
@@ -591,11 +474,8 @@ class CallSession extends Emitter {
      this.logger.debug({opts}, 'CallSession:startBackgroundListen');
      const t = normalizeJambones(this.logger, [opts]);
      this.backgroundListenTask = makeTask(this.logger, t[0]);
-      this.backgroundListenTask.bugname = bugname;
-      // Remove unneeded customer data to be sent to api server.
-      this.backgroundListenTask.ignoreCustomerData = true;
      const resources = await this._evaluatePreconditions(this.backgroundListenTask);
-      const {span, ctx} = this.rootSpan.startChildSpan(`background-listen:${this.backgroundListenTask.summary}`);
+      const {span, ctx} = this.rootSpan.startChildSpan(`background-gather:${this.backgroundListenTask.summary}`);
      this.backgroundListenTask.span = span;
      this.backgroundListenTask.ctx = ctx;
      this.backgroundListenTask.exec(this, resources)
@@ -618,7 +498,6 @@ class CallSession extends Emitter {
  }

  async stopBackgroundListen() {
-    this.logger.debug('CallSession:stopBackgroundListen');
    try {
      if (this.backgroundListenTask) {
        this.backgroundListenTask.removeAllListeners();
@@ -627,6 +506,7 @@ class CallSession extends Emitter {
    } catch (err) {
      this.logger.info({err}, 'CallSession:stopBackgroundListen - Error stopping listen task');
    }
+    this.backgroundListenTask = null;
  }

  async enableBotMode(gather, autoEnable) {
@@ -645,7 +525,7 @@ class CallSession extends Emitter {
          this.logger.info({currInput, newInput},
            'CallSession:enableBotMode - restarting background gather to apply new input type');
          this.backgroundGatherTask.sticky = false;
-          await this.disableBotMode();
+          this.disableBotMode();
        }
      }
      this.backgroundGatherTask = task;
@@ -684,12 +564,12 @@ class CallSession extends Emitter {
      this.logger.info({err, gather}, 'CallSession:enableBotMode - Error creating gather task');
    }
  }
-  async disableBotMode() {
+  disableBotMode() {
    this._bargeInEnabled = false;
    if (this.backgroundGatherTask) {
      try {
        this.backgroundGatherTask.removeAllListeners();
-        await this.backgroundGatherTask.kill();
+        this.backgroundGatherTask.kill().catch((err) => {});
      } catch (err) {}
      this.backgroundGatherTask = null;
    }
@@ -716,28 +596,15 @@ class CallSession extends Emitter {
   * Check for speech credentials for the specified vendor
   * @param {*} vendor - google or aws
   */
-  getSpeechCredentials(vendor, type, label = null) {
+  getSpeechCredentials(vendor, type) {
    const {writeAlerts, AlertType} = this.srf.locals;
    if (this.accountInfo.speech && this.accountInfo.speech.length > 0) {
-      // firstly check if account level has expected credential
-      let credential = this.accountInfo.speech.find((s) => s.vendor === vendor &&
-        s.label === label && s.account_sid);
-      if (!credential) {
-        // check if SP level has expected credential
-        credential = this.accountInfo.speech.find((s) => s.vendor === vendor &&
-        s.label === label && !s.account_sid);
-      }
+      const credential = this.accountInfo.speech.find((s) => s.vendor === vendor);
      if (credential && (
        (type === 'tts' && credential.use_for_tts) ||
        (type === 'stt' && credential.use_for_stt)
      )) {
-        this.logger.info(`Speech credential vendor: ${credential.vendor} 
-${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
        if ('google' === vendor) {
-          if (type === 'tts' && !credential.tts_tested_ok ||
-            type === 'stt' && !credential.stt_tested_ok) {
-            return;
-          }
          try {
            const cred = JSON.parse(credential.service_key.replace(/\n/g, '\\n'));
            return {
@@ -759,7 +626,7 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
            speech_credential_sid: credential.speech_credential_sid,
            accessKeyId: credential.access_key_id,
            secretAccessKey: credential.secret_access_key,
-            region: credential.aws_region || AWS_REGION
+            region: credential.aws_region || process.env.AWS_REGION
          };
        }
        else if ('microsoft' === vendor) {
@@ -769,10 +636,8 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
            region: credential.region,
            use_custom_stt: credential.use_custom_stt,
            custom_stt_endpoint: credential.custom_stt_endpoint,
-            custom_stt_endpoint_url: credential.custom_stt_endpoint_url,
            use_custom_tts: credential.use_custom_tts,
-            custom_tts_endpoint: credential.custom_tts_endpoint,
-            custom_tts_endpoint_url: credential.custom_tts_endpoint_url
+            custom_tts_endpoint: credential.custom_tts_endpoint
          };
        }
        else if ('wellsaid' === vendor) {
@@ -811,12 +676,6 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
            stt_region: credential.stt_region
          };
        }
-        else if ('nvidia' === vendor) {
-          return {
-            speech_credential_sid: credential.speech_credential_sid,
-            riva_server_uri: credential.riva_server_uri
-          };
-        }
        else if (vendor.startsWith('custom:')) {
          return {
            speech_credential_sid: credential.speech_credential_sid,
@@ -861,12 +720,11 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
          }
          else {
            this.logger.info('CallSession:exec disabling bot mode to start gather with new options');
-            await this.disableBotMode();
+            this.disableBotMode();
          }
        }
        if (!skip) {
          const {span, ctx} = this.rootSpan.startChildSpan(`verb:${task.summary}`);
-          span.setAttributes({'verb.summary': task.summary});
          task.span = span;
          task.ctx = ctx;
          await task.exec(this, resources);
@@ -887,15 +745,20 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
        }
      }

-      if (0 === this.tasks.length &&
-        this.requestor instanceof WsRequestor &&
-        !this.requestor.closedGracefully &&
-        !this.callGone
-      ) {
+      if (0 === this.tasks.length && this.requestor instanceof WsRequestor && !this.callGone) {
+        let span;
        try {
-          await this._awaitCommandsOrHangup();
+          const {span} = this.rootSpan.startChildSpan('waiting for commands');
+          const {reason, queue, command} = await this._awaitCommandsOrHangup();
+          span.setAttributes({
+            'completion.reason': reason,
+            'async.request.queue': queue,
+            'async.request.command': command
+          });
+          span.end();
          if (this.callGone) break;
        } catch (err) {
+          span.end();
          this.logger.info(err, 'CallSession:exec - error waiting for new commands');
          break;
        }
@@ -1075,24 +938,6 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
    listenTask.updateListen(opts.listen_status);
  }

-  /**
-   * perform live call control -- change Transcribe status
-   * @param {object} opts
-   * @param {string} opts.transcribe_status - 'pause' or 'resume'
-  */
-  async _lccTranscribeStatus(opts) {
-    const task = this.currentTask;
-    if (!task || ![TaskName.Dial, TaskName.Transcribe].includes(task.name)) {
-      return this.logger.info(`CallSession:_lccTranscribeStatus - invalid transcribe_status in task ${task.name}`);
-    }
-    const transcribeTask = task.name === TaskName.Transcribe ? task : task.transcribeTask;
-    if (!transcribeTask) {
-      return this.logger
-        .info('CallSession:_lccTranscribeStatus - invalid transcribe_status: Dial does not have a Transcribe');
-    }
-    transcribeTask.updateTranscribe(opts.transcribe_status);
-  }
-
  async _lccMuteStatus(callSid, mute) {
    // this whole thing requires us to be in a Dial or Conference verb
    const task = this.currentTask;
@@ -1211,9 +1056,6 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
    if (opts.listen_status) {
      await this._lccListenStatus(opts);
    }
-    if (opts.transcribe_status) {
-      await this._lccTranscribeStatus(opts);
-    }
    else if (opts.mute_status) {
      await this._lccMuteStatus(callSid, opts.mute_status === 'mute');
    }
@@ -1346,7 +1188,7 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
  }

  _onCommand({msgid, command, call_sid, queueCommand, data}) {
-    this.logger.info({msgid, command, queueCommand, data}, 'CallSession:_onCommand - received command');
+    this.logger.info({msgid, command, queueCommand}, 'CallSession:_onCommand - received command');
    const resolution = {reason: 'received command', queue: queueCommand, command};
    switch (command) {
      case 'redirect':
@@ -1357,7 +1199,7 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
            this.logger.info({tasks: listTaskNames(t)}, 'CallSession:_onCommand new task list');
            this.replaceApplication(t);
          }
-          else if (JAMBONES_INJECT_CONTENT) {
+          else if (process.env.JAMBONES_INJECT_CONTENT) {
            this._injectTasks(t);
            this.logger.info({tasks: listTaskNames(this.tasks)}, 'CallSession:_onCommand - updated task list');
          }
@@ -1390,10 +1232,6 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
        this._lccListenStatus(data);
        break;

-      case 'transcribe:status':
-        this._lccTranscribeStatus(data);
-        break;
-
      case 'whisper':
        this._lccWhisper(data, call_sid);
        break;
@@ -1413,17 +1251,15 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
      this.wakeupResolver(resolution);
      this.wakeupResolver = null;
    }
-    /*
    else {
+      const {span} = this.rootSpan.startChildSpan('async command');
      const {queue, command} = resolution;
-      const {span} = this.rootSpan.startChildSpan(`recv cmd: ${command}`);
      span.setAttributes({
        'async.request.queue': queue,
        'async.request.command': command
      });
      span.end();
    }
-    */
  }

  _onWsConnectionDropped() {
@@ -1463,10 +1299,7 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
      }

      // we are going from an early media connection to answer
-      if (this.direction === CallDirection.Inbound) {
-        // only do this for inbound call.
-        await this.propagateAnswer();
-      }
+      await this.propagateAnswer();
      return {
        ...resources,
        ...(this.isSipRecCallSession && {ep2: this.ep2})
@@ -1486,8 +1319,6 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
      this.ep = ep;
      this.logger.debug(`allocated endpoint ${ep.uuid}`);

-      this._configMsEndpoint();
-
      this.ep.on('destroy', () => {
        this.logger.debug(`endpoint was destroyed!! ${this.ep.uuid}`);
      });
@@ -1558,7 +1389,6 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
      return;
    }
    this.ep = await this.ms.createEndpoint({remoteSdp: this.dlg.remote.sdp});
-    this._configMsEndpoint();

    await this.dlg.modify(this.ep.local.sdp);
    this.logger.debug('CallSession:replaceEndpoint completed');
@@ -1640,6 +1470,7 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
      }
      this.dlg.on('modify', this._onReinvite.bind(this));
      this.dlg.on('refer', this._onRefer.bind(this));
+
      this.logger.debug(`CallSession:propagateAnswer - answered callSid ${this.callSid}`);
    }
  }
@@ -1652,14 +1483,9 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
          res.send(200, {body: this.ep.local.sdp});
        }
        else {
-          if (this.currentTask.name === TaskName.Dial && this.currentTask.isOnHold) {
-            this.logger.info('onholdMusic reINVITE after media has been released');
-            await this.currentTask.handleReinviteAfterMediaReleased(req, res);
-          } else {
-            const newSdp = await this.ep.modify(req.body);
-            res.send(200, {body: newSdp});
-            this.logger.info({offer: req.body, answer: newSdp}, 'handling reINVITE');
-          }
+          const newSdp = await this.ep.modify(req.body);
+          res.send(200, {body: newSdp});
+          this.logger.info({offer: req.body, answer: newSdp}, 'handling reINVITE');
        }
      }
      else if (this.currentTask && this.currentTask.name === TaskName.Dial) {
@@ -1706,7 +1532,6 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
    }
    if (!this.ep) {
      this.ep = await this.ms.createEndpoint({remoteSdp: this.req.body});
-      this._configMsEndpoint();
    }
    return {ms: this.ms, ep: this.ep};
  }
@@ -1720,7 +1545,7 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
      const pp = this._pool.promise();
      try {
        this.logger.info({accountSid: this.accountSid}, 'performQueueWebhook: looking up account');
-        const [r] = await pp.query(sqlRetrieveQueueEventHook, [this.accountSid]);
+        const [r] = await pp.query(sqlRetrieveQueueEventHook, this.accountSid);
        if (0 === r.length) {
          this.logger.info({accountSid: this.accountSid}, 'performQueueWebhook: no webhook provisioned');
          this.queueEventHookRequestor = null;
@@ -1861,7 +1686,6 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
        'X-Reason': 'anchor-media'
      }
    });
-    this._configMsEndpoint();
  }

  async handleReinviteAfterMediaReleased(req, res) {
@@ -1883,14 +1707,6 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
  async _notifyCallStatusChange({callStatus, sipStatus, sipReason, duration}) {
    if (this.callMoved) return;

-    if (callStatus === CallStatus.InProgress) {
-      // nice, call is in progress, good time to enable record
-      await this.enableRecordAllCall();
-    } else if (callStatus == CallStatus.Completed && this.isBackGroundListen) {
-      this.stopBackgroundListen().catch((err) => this.logger.error(
-        {err}, 'CallSession:_notifyCallStatusChange - error stopping background listen'));
-    }
-
    /* race condition: we hang up at the same time as the caller */
    if (callStatus === CallStatus.Completed) {
      if (this.notifiedComplete) return;
@@ -1903,15 +1719,6 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);

    this.callInfo.updateCallStatus(callStatus, sipStatus, sipReason);
    if (typeof duration === 'number') this.callInfo.duration = duration;
-    this.executeStatusCallback(callStatus, sipStatus);
-
-    // update calls db
-    //this.logger.debug(`updating redis with ${JSON.stringify(this.callInfo)}`);
-    this.updateCallStatus(Object.assign({}, this.callInfo.toJSON()), this.serviceUrl)
-      .catch((err) => this.logger.error(err, 'redis error'));
-  }
-
-  async executeStatusCallback(callStatus, sipStatus) {
    const {span} = this.rootSpan.startChildSpan(`call-status:${this.callInfo.callStatus}`);
    span.setAttributes(this.callInfo.toJSON());
    try {
@@ -1923,30 +1730,11 @@ ${credential.label ? `, label: ${credential.label}` : ''} is chosen`);
      span.end();
      this.logger.info(err, `CallSession:_notifyCallStatusChange error sending ${callStatus} ${sipStatus}`);
    }
-  }

-  async enableRecordAllCall() {
-    if (this.accountInfo.account.record_all_calls || this.application.record_all_calls) {
-      const listenOpts = {
-        url: `${JAMBONZ_RECORD_WS_BASE_URL}/record/${this.accountInfo.account.bucket_credential.vendor}`,
-        wsAuth: {
-          username: JAMBONZ_RECORD_WS_USERNAME,
-          password: JAMBONZ_RECORD_WS_PASSWORD
-        },
-        disableBidirectionalAudio: true,
-        mixType : 'stereo',
-        passDtmf: true
-      };
-
-      this.logger.debug({listenOpts}, 'Record all calls: enabling listen');
-      await this.startBackgroundListen({verb: 'listen', ...listenOpts}, 'jambonz-session-record');
-    }
-  }
-
-  _configMsEndpoint() {
-    if (this.onHoldMusic) {
-      this.ep.set({hold_music: `shout://${this.onHoldMusic.replace(/^https?:\/\//, '')}`});
-    }
+    // update calls db
+    //this.logger.debug(`updating redis with ${JSON.stringify(this.callInfo)}`);
+    this.updateCallStatus(Object.assign({}, this.callInfo.toJSON()), this.serviceUrl)
+      .catch((err) => this.logger.error(err, 'redis error'));
  }

  /**
--- a/lib/session/rest-call-session.js
+++ b/lib/session/rest-call-session.js
@@ -21,10 +21,6 @@ class RestCallSession extends CallSession {
    });
    this.req = req;
    this.ep = ep;
-    // keep restDialTask reference for closing AMD
-    if (tasks.length) {
-      this.restDialTask = tasks[0];
-    }

    this.on('callStatusChange', this._notifyCallStatusChange.bind(this));
    this._notifyCallStatusChange({
@@ -48,9 +44,6 @@ class RestCallSession extends CallSession {
   * This is invoked when the called party hangs up, in order to calculate the call duration.
   */
  _callerHungup() {
-    if (this.restDialTask) {
-      this.restDialTask.turnOffAmd();
-    }
    this.callInfo.callTerminationBy = 'caller';
    const duration = moment().diff(this.dlg.connectTime, 'seconds');
    this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
--- a/lib/tasks/conference.js
+++ b/lib/tasks/conference.js
@@ -48,7 +48,7 @@ class Conference extends Task {
    this.confName = this.data.name;
    [
      'beep', 'startConferenceOnEnter', 'endConferenceOnExit', 'joinMuted',
-      'maxParticipants', 'waitHook', 'statusHook', 'endHook', 'enterHook', 'endConferenceDuration'
+      'maxParticipants', 'waitHook', 'statusHook', 'endHook', 'enterHook'
    ].forEach((attr) => this[attr] = this.data[attr]);
    this.record = this.data.record || {};
    this.statusEvents = [];
@@ -114,12 +114,7 @@ class Conference extends Task {
    }
    this.emitter.emit('kill');
    await this._doFinalMemberCheck(cs);
-    if (this.ep && this.ep.connected) {
-      this.ep.conn.removeAllListeners('esl::event::CUSTOM::*');
-      this.ep.api(`conference ${this.confName} kick ${this.memberId}`)
-        .catch((err) => this.logger.info({err}, 'Error kicking participant'));
-    }
-    cs.clearConferenceDetails();
+    if (this.ep && this.ep.connected) this.ep.conn.removeAllListeners('esl::event::CUSTOM::*') ;
    this.notifyTaskDone();
  }

@@ -344,13 +339,9 @@ class Conference extends Task {
    }

    const opts = {};
-    if (this.endConferenceOnExit || this.startConferenceOnEnter || this.joinMuted) {
-      Object.assign(opts, {flags: {
-        ...(this.endConferenceOnExit && {endconf: true}),
-        ...(this.startConferenceOnEnter && {moderator: true}),
-        ...(this.joinMuted && {joinMuted: true}),
-      }});
-    }
+    if (this.endConferenceOnExit) Object.assign(opts, {flags: {endconf: true}});
+    if (this.startConferenceOnEnter) Object.assign(opts, {flags: {moderator: true}});
+    if (this.joinMuted) Object.assign(opts, {flags: {mute: true}});

    try {
      const {memberId, confUuid} = await this.ep.join(this.confName, opts);
@@ -393,11 +384,6 @@ class Conference extends Task {
      this.ep.api('conference', `${this.confName} set max_members ${this.maxParticipants}`)
        .catch((err) => this.logger.error(err, `Error setting max participants to ${this.maxParticipants}`));
    }
-
-    if (typeof this.endConferenceDuration === 'number' && this.endConferenceDuration >= 0) {
-      this.ep.api('conference', `${this.confName} set endconference_grace_time ${this.endConferenceDuration}`)
-        .catch((err) => this.logger.error(err, `Error setting end conference time to ${this.endConferenceDuration}`));
-    }
  }

  /**
--- a/lib/tasks/config.js
+++ b/lib/tasks/config.js
@@ -30,18 +30,10 @@ class TaskConfig extends Task {
        if (this.bargeIn[k]) this.gatherOpts[k] = this.bargeIn[k];
      });
    }
-
-    if (this.data.reset) {
-      if (typeof this.data.reset === 'string') this.data.reset = [this.data.reset];
-    }
-    else this.data.reset = [];
-
    if (this.bargeIn.sticky) this.autoEnable = true;
    this.preconditions = (this.bargeIn.enable || this.record?.action || this.listen?.url || this.data.amd) ?
      TaskPreconditions.Endpoint :
      TaskPreconditions.None;
-
-    this.onHoldMusic = this.data.onHoldMusic;
  }

  get name() { return TaskName.Config; }
@@ -53,10 +45,6 @@ class TaskConfig extends Task {

  get summary() {
    const phrase = [];
-
-    /* reset recognizer and/or synthesizer to default values? */
-    if (this.data.reset.length) phrase.push(`reset ${this.data.reset.join(',')}`);
-
    if (this.bargeIn.enable) phrase.push('enable barge-in');
    if (this.hasSynthesizer) {
      const {vendor:v, language:l, voice} = this.synthesizer;
@@ -74,8 +62,7 @@ class TaskConfig extends Task {
    }
    if (this.data.amd) phrase.push('enable amd');
    if (this.notifyEvents) phrase.push(`event notification ${this.notifyEvents ? 'on' : 'off'}`);
-    if (this.onHoldMusic) phrase.push(`onHoldMusic: ${this.onHoldMusic}`);
-    return `${this.name}{${phrase.join(',')}}`;
+    return `${this.name}{${phrase.join(',')}`;
  }

  async exec(cs, {ep} = {}) {
@@ -86,10 +73,6 @@ class TaskConfig extends Task {
      cs.notifyEvents = !!this.data.notifyEvents;
    }

-    if (this.onHoldMusic) {
-      cs.onHoldMusic = this.onHoldMusic;
-    }
-
    if (this.data.amd) {
      this.startAmd = cs.startAmd;
      this.stopAmd = cs.stopAmd;
@@ -103,62 +86,25 @@ class TaskConfig extends Task {
      }
    }

-    this.data.reset.forEach((k) => {
-      if (k === 'synthesizer') cs.resetSynthesizer();
-      else if (k === 'recognizer') cs.resetRecognizer();
-    });
-
    if (this.hasSynthesizer) {
      cs.speechSynthesisVendor = this.synthesizer.vendor !== 'default'
        ? this.synthesizer.vendor
        : cs.speechSynthesisVendor;
-      cs.speechSynthesisLabel = this.synthesizer.label !== 'default'
-        ? this.synthesizer.label
-        : cs.speechSynthesisLabel;
      cs.speechSynthesisLanguage = this.synthesizer.language !== 'default'
        ?  this.synthesizer.language
        : cs.speechSynthesisLanguage;
      cs.speechSynthesisVoice = this.synthesizer.voice !== 'default'
        ? this.synthesizer.voice
        : cs.speechSynthesisVoice;
-
-      // fallback vendor
-      cs.fallbackSpeechSynthesisVendor = this.synthesizer.fallbackVendor !== 'default'
-        ? this.synthesizer.fallbackVendor
-        : cs.fallbackSpeechSynthesisVendor;
-      cs.fallbackSpeechSynthesisLabel = this.synthesizer.fallbackLabel !== 'default'
-        ? this.synthesizer.fallbackLabel
-        : cs.fallbackSpeechSynthesisLabel;
-      cs.fallbackSpeechSynthesisLanguage = this.synthesizer.fallbackLanguage !== 'default'
-        ?  this.synthesizer.fallbackLanguage
-        : cs.fallbackSpeechSynthesisLanguage;
-      cs.fallbackSpeechSynthesisVoice = this.synthesizer.fallbackVoice !== 'default'
-        ? this.synthesizer.fallbackVoice
-        : cs.fallbackSpeechSynthesisVoice;
      this.logger.info({synthesizer: this.synthesizer}, 'Config: updated synthesizer');
    }
    if (this.hasRecognizer) {
      cs.speechRecognizerVendor = this.recognizer.vendor !== 'default'
        ? this.recognizer.vendor
        : cs.speechRecognizerVendor;
-      cs.speechRecognizerLabel = this.recognizer.label !== 'default'
-        ? this.recognizer.label
-        : cs.speechRecognizerLabel;
      cs.speechRecognizerLanguage = this.recognizer.language !== 'default'
        ? this.recognizer.language
        : cs.speechRecognizerLanguage;
-
-      //fallback
-      cs.fallbackSpeechRecognizerVendor = this.recognizer.fallbackVendor !== 'default'
-        ? this.recognizer.fallbackVendor
-        : cs.fallbackSpeechRecognizerVendor;
-      cs.fallbackSpeechRecognizerLabel = this.recognizer.fallbackLabel !== 'default'
-        ? this.recognizer.fallbackLabel
-        : cs.fallbackSpeechRecognizerLabel;
-      cs.fallbackSpeechRecognizerLanguage = this.recognizer.fallbackLanguage !== 'default'
-        ? this.recognizer.fallbackLanguage
-        : cs.fallbackSpeechRecognizerLanguage;
-
      cs.isContinuousAsr = typeof this.recognizer.asrTimeout === 'number' ? true : false;
      if (cs.isContinuousAsr) {
        cs.asrTimeout = this.recognizer.asrTimeout;
--- a/lib/tasks/dequeue.js
+++ b/lib/tasks/dequeue.js
@@ -16,7 +16,6 @@ class TaskDequeue extends Task {
    this.queueName = this.data.name;
    this.timeout = this.data.timeout || 0;
    this.beep = this.data.beep === true;
-    this.callSid = this.data.callSid;

    this.emitter = new Emitter();
    this.state = DequeueResults.Timeout;
@@ -54,7 +53,7 @@ class TaskDequeue extends Task {
  }

  _getMemberFromQueue(cs) {
-    const {retrieveFromSortedSet, retrieveByPatternSortedSet} = cs.srf.locals.dbHelpers;
+    const {popFront} = cs.srf.locals.dbHelpers;

    return new Promise(async(resolve) => {
      let timer;
@@ -71,12 +70,7 @@ class TaskDequeue extends Task {

      do {
        try {
-          let url;
-          if (this.callSid) {
-            url = await retrieveByPatternSortedSet(this.queueName, `*${this.callSid}`);
-          } else {
-            url = await retrieveFromSortedSet(this.queueName);
-          }
+          const url = await popFront(this.queueName);
          if (url) {
            found = true;
            clearTimeout(timer);
@@ -84,7 +78,7 @@ class TaskDequeue extends Task {
            resolve(url);
          }
        } catch (err) {
-          this.logger.debug({err}, 'TaskDequeue:_getMemberFromQueue error Sorted Set');
+          this.logger.debug({err}, 'TaskDequeue:_getMemberFromQueue error popFront');
        }
        await sleepFor(5000);
      } while (!this.killed && !timedout && !found);
--- a/lib/tasks/dial.js
+++ b/lib/tasks/dial.js
@@ -12,13 +12,9 @@ const assert = require('assert');
 const placeCall = require('../utils/place-outdial');
 const sessionTracker = require('../session/session-tracker');
 const DtmfCollector = require('../utils/dtmf-collector');
-const ConfirmCallSession = require('../session/confirm-call-session');
 const dbUtils = require('../utils/db-utils');
 const debug = require('debug')('jambonz:feature-server');
 const {parseUri} = require('drachtio-srf');
-const {ANCHOR_MEDIA_ALWAYS} = require('../config');
-const { isOnhold } = require('../utils/sdp-utils');
-const { normalizeJambones } = require('@jambonz/verb-specifications');

 function parseDtmfOptions(logger, dtmfCapture) {
  let parentDtmfCollector, childDtmfCollector;
@@ -88,7 +84,6 @@ class TaskDial extends Task {

    this.earlyMedia = this.data.answerOnBridge === true;
    this.callerId = this.data.callerId;
-    this.callerName = this.data.callerName;
    this.dialMusic = this.data.dialMusic;
    this.headers = this.data.headers || {};
    this.method = this.data.method || 'POST';
@@ -138,19 +133,11 @@ class TaskDial extends Task {

  get name() { return TaskName.Dial; }

-  get isOnHold() {
-    return this.isIncomingLegHold || this.isOutgoingLegHold;
-  }
-
  get canReleaseMedia() {
-    const keepAnchor = this.data.anchorMedia ||
-    this.cs.isBackGroundListen ||
-    ANCHOR_MEDIA_ALWAYS ||
-    this.listenTask ||
-    this.transcribeTask ||
-    this.startAmd;
-
-    return !keepAnchor;
+    return !process.env.ANCHOR_MEDIA_ALWAYS &&
+      !this.listenTask &&
+      !this.transcribeTask &&
+      !this.startAmd;
  }

  get summary() {
@@ -174,16 +161,6 @@ class TaskDial extends Task {
  async exec(cs) {
    await super.exec(cs);
    try {
-      if (this.listenTask) {
-        const {span, ctx} = this.startChildSpan(`nested:${this.listenTask.summary}`);
-        this.listenTask.span = span;
-        this.listenTask.ctx = ctx;
-      }
-      if (this.transcribeTask) {
-        const {span, ctx} = this.startChildSpan(`nested:${this.transcribeTask.summary}`);
-        this.transcribeTask.span = span;
-        this.transcribeTask.ctx = ctx;
-      }
      if (this.data.amd) {
        this.startAmd = cs.startAmd;
        this.stopAmd = cs.stopAmd;
@@ -232,7 +209,7 @@ class TaskDial extends Task {
    }
    this._removeDtmfDetection(cs.dlg);
    this._removeDtmfDetection(this.dlg);
-    await this._killOutdials();
+    this._killOutdials();
    if (this.sd) {
      this.sd.kill();
      this.sd.removeAllListeners();
@@ -241,12 +218,10 @@ class TaskDial extends Task {
    if (this.callSid) sessionTracker.remove(this.callSid);
    if (this.listenTask) {
      await this.listenTask.kill(cs);
-      this.listenTask.span.end();
      this.listenTask = null;
    }
    if (this.transcribeTask) {
      await this.transcribeTask.kill(cs);
-      this.transcribeTask.span.end();
      this.transcribeTask = null;
    }
    this.notifyTaskDone();
@@ -353,16 +328,11 @@ class TaskDial extends Task {
    sd.removeAllListeners('callCreateFail');
  }

-  async _killOutdials() {
+  _killOutdials() {
    for (const [callSid, sd] of Array.from(this.dials)) {
      this.logger.debug(`Dial:_killOutdials killing callSid ${callSid}`);
-      try {
-        await sd.kill();
-      } catch (err) {
-        this.logger.info(err, `Dial:_killOutdials Error killing ${callSid}`);
-      }
+      sd.kill().catch((err) => this.logger.info(err, `Dial:_killOutdials Error killing ${callSid}`));
      this._removeHandlers(sd);
-      this.logger.debug(`Dial:_killOutdials killed callSid ${callSid}`);
    }
    this.dials.clear();
  }
@@ -424,7 +394,7 @@ class TaskDial extends Task {
    const {req, srf} = cs;
    const {getSBC} = srf.locals;
    const {lookupTeamsByAccount, lookupAccountBySid} = srf.locals.dbHelpers;
-    const {lookupCarrier, lookupCarrierByPhoneNumber} = dbUtils(this.logger, cs.srf);
+    const {lookupCarrier} = dbUtils(this.logger, cs.srf);
    const sbcAddress = this.proxy || getSBC();
    const teamsInfo = {};
    let fqdn;
@@ -434,7 +404,6 @@ class TaskDial extends Task {
      'X-Account-Sid': cs.accountSid,
      ...(req && req.has('X-CID') && {'X-CID': req.get('X-CID')}),
      ...(req && req.has('P-Asserted-Identity') && {'P-Asserted-Identity': req.get('P-Asserted-Identity')}),
-      ...(req && req.has('X-Voip-Carrier-Sid') && {'X-Voip-Carrier-Sid': req.get('X-Voip-Carrier-Sid')}),
      // Put headers at the end to make sure opt.headers override all default behavior.
      ...this.headers
    };
@@ -442,8 +411,7 @@ class TaskDial extends Task {
    const opts = {
      headers: this.headers,
      proxy: `sip:${sbcAddress}`,
-      callingNumber: this.callerId || req.callingNumber,
-      ...(this.callerName && {callingName: this.callerName})
+      callingNumber: this.callerId || req.callingNumber
    };

    const t = this.target.find((t) => t.type === 'teams');
@@ -454,14 +422,10 @@ class TaskDial extends Task {
    }

    const ms = await cs.getMS();
-    this.timerRing = setTimeout(async() => {
+    this.timerRing = setTimeout(() => {
      this.logger.info(`Dial:_attemptCall: ring no answer timer ${this.timeout}s exceeded`);
      this.timerRing = null;
-      try {
-        await this._killOutdials();
-      } catch (err) {
-        this.logger.info(err, 'Dial:_attemptCall - error killing outdials');
-      }
+      this._killOutdials();
      this.result = {
        dialCallStatus: CallStatus.NoAnswer,
        dialSipStatus: 487
@@ -489,22 +453,7 @@ class TaskDial extends Task {
        }
        if (t.type === 'phone' && t.trunk) {
          const voip_carrier_sid = await lookupCarrier(cs.accountSid, t.trunk);
-          this.logger.info(`Dial:_attemptCalls: selected ${voip_carrier_sid} for requested carrier: ${t.trunk}`);
-          if (voip_carrier_sid) {
-            opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
-          }
-        }
-
-        /**
-         * trunk isn't specified,
-         * check if number matches any existing numbers
-         *  */
-        if (t.type === 'phone' && !t.trunk) {
-          const str = this.callerId || req.callingNumber || '';
-          const callingNumber = str.startsWith('+') ? str.substring(1) : str;
-          const voip_carrier_sid = await lookupCarrierByPhoneNumber(cs.accountSid, callingNumber);
-          this.logger.info(
-            `Dial:_attemptCalls: selected ${voip_carrier_sid} for requested phone number: ${callingNumber}`);
+          this.logger.info(`Dial:_attemptCalls: selected ${voip_carrier_sid} for requested carrier: ${t.trunk})`);
          if (voip_carrier_sid) {
            opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
          }
@@ -523,8 +472,7 @@ class TaskDial extends Task {
          callInfo: cs.callInfo,
          accountInfo: cs.accountInfo,
          rootSpan: cs.rootSpan,
-          startSpan: this.startSpan.bind(this),
-          dialTask: this
+          startSpan: this.startSpan.bind(this)
        });
        this.dials.set(sd.callSid, sd);

@@ -540,8 +488,7 @@ class TaskDial extends Task {
            }
          })
          .on('callStatusChange', (obj) => {
-            if (this.results.dialCallStatus !== CallStatus.Completed &&
-              this.results.dialCallStatus !== CallStatus.NoAnswer) {
+            if (this.results.dialCallStatus !== CallStatus.Completed) {
              Object.assign(this.results, {
                dialCallStatus: obj.callStatus,
                dialSipStatus: obj.sipStatus,
@@ -594,7 +541,11 @@ class TaskDial extends Task {
            }
          })
          .on('reinvite', (req, res) => {
-            this._onReinvite(req, res);
+            try {
+              cs.handleReinviteAfterMediaReleased(req, res);
+            } catch (err) {
+              this.logger.error(err, 'Error in dial einvite from B leg');
+            }
          })
          .on('refer', (callInfo, req, res) => {

@@ -630,35 +581,6 @@ class TaskDial extends Task {
    this._killOutdials();       // NB: order is important
  }

-  async _onReinvite(req, res) {
-    try {
-      let isHandled = false;
-      if (this.cs.onHoldMusic) {
-        if (isOnhold(req.body) && !this.epOther && !this.ep) {
-          await this.cs.handleReinviteAfterMediaReleased(req, res);
-          // Onhold but media is already released
-          // reconnect A Leg and Response B leg
-          await this.reAnchorMedia(this.cs, this.sd);
-          this.isOutgoingLegHold = true;
-          isHandled = true;
-          this._onHoldHook();
-        } else if (!isOnhold(req.body) && this.epOther && this.ep && this.isOutgoingLegHold && this.canReleaseMedia) {
-          // Offhold, time to release media
-          const newSdp = await this.ep.modify(req.body);
-          await res.send(200, {body: newSdp});
-          await this._releaseMedia(this.cs, this.sd);
-          isHandled = true;
-          this.isOutgoingLegHold = false;
-        }
-      }
-      if (!isHandled) {
-        this.cs.handleReinviteAfterMediaReleased(req, res);
-      }
-    } catch (err) {
-      this.logger.error(err, 'Error in dial einvite from B leg');
-    }
-  }
-
  _onMaxCallDuration(cs) {
    this.logger.info(`Dial:_onMaxCallDuration tearing down call as it has reached ${this.timeLimit}s`);
    this.ep && this.ep.unbridge();
@@ -712,7 +634,7 @@ class TaskDial extends Task {
    if (this.parentDtmfCollector) this._installDtmfDetection(cs, cs.dlg);
    if (this.childDtmfCollector) this._installDtmfDetection(cs, this.dlg);

-    if (this.transcribeTask) this.transcribeTask.exec(cs, {ep: this.epOther, ep2:this.ep});
+    if (this.transcribeTask) this.transcribeTask.exec(cs, {ep2: this.epOther, ep:this.ep});
    if (this.listenTask) this.listenTask.exec(cs, {ep: this.epOther});
    if (this.startAmd) {
      try {
@@ -763,29 +685,9 @@ class TaskDial extends Task {
  }

  async handleReinviteAfterMediaReleased(req, res) {
-    let isHandled = false;
-    if (isOnhold(req.body) && !this.epOther && !this.ep) {
-      const sdp = await this.dlg.modify(req.body);
-      res.send(200, {body: sdp});
-      // Onhold but media is already released
-      await this.reAnchorMedia(this.cs, this.sd);
-      isHandled = true;
-      this.isIncomingLegHold = true;
-      this._onHoldHook();
-    } else if (!isOnhold(req.body) && this.epOther && this.ep && this.isIncomingLegHold && this.canReleaseMedia) {
-      // Offhold, time to release media
-      const newSdp = await this.epOther.modify(req.body);
-      await res.send(200, {body: newSdp});
-      await this._releaseMedia(this.cs, this.sd);
-      isHandled = true;
-      this.isIncomingLegHold = false;
-    }
-
-    if (!isHandled) {
-      const sdp = await this.dlg.modify(req.body);
-      this.logger.info({sdp}, 'Dial:handleReinviteAfterMediaReleased - sent reinvite to B leg');
-      res.send(200, {body: sdp});
-    }
+    const sdp = await this.dlg.modify(req.body);
+    this.logger.info({sdp}, 'Dial:handleReinviteAfterMediaReleased - sent reinvite to B leg');
+    res.send(200, {body: sdp});
  }

  _onAmdEvent(cs, evt) {
@@ -796,48 +698,6 @@ class TaskDial extends Task {
        this.logger.error({err}, 'Dial:_onAmdEvent - error calling actionHook');
      });
  }
-
-  async _onHoldHook(allowed = [TaskName.Play, TaskName.Say, TaskName.Pause]) {
-    if (this.data.onHoldHook) {
-      // send silence for keep Voice quality
-      await this.epOther.play('silence_stream://500');
-      let allowedTasks;
-      do {
-        try {
-          const b3 = this.getTracingPropagation();
-          const httpHeaders = b3 && {b3};
-          const json = await this.cs.application.requestor.
-            request('verb:hook', this.data.onHoldHook, this.cs.callInfo.toJSON(), httpHeaders);
-          const tasks = normalizeJambones(this.logger, json).map((tdata) => makeTask(this.logger, tdata));
-          allowedTasks = tasks.filter((t) => allowed.includes(t.name));
-          if (tasks.length !== allowedTasks.length) {
-            this.logger.debug({tasks, allowedTasks}, 'unsupported task');
-            throw new Error(`unsupported verb in enqueue waitHook: only ${JSON.stringify(allowed)}`);
-          }
-          this.logger.debug(`DialTask:_onHoldHook: executing ${tasks.length} tasks`);
-          if (tasks.length) {
-            this._playSession = new ConfirmCallSession({
-              logger: this.logger,
-              application: this.cs.application,
-              dlg: this.isIncomingLegHold ? this.dlg : this.cs.dlg,
-              ep: this.isIncomingLegHold ? this.ep : this.cs.ep,
-              callInfo: this.cs.callInfo,
-              accountInfo: this.cs.accountInfo,
-              tasks,
-              rootSpan: this.cs.rootSpan
-            });
-            await this._playSession.exec();
-            this._playSession = null;
-          }
-        } catch (error) {
-          this.logger.info(error, 'DialTask:_onHoldHook: failed retrieving waitHook');
-          this._playSession = null;
-          break;
-        }
-      } while (allowedTasks && allowedTasks.length > 0 && !this.killed && this.isOnHold);
-      this.logger.info('Finish onHoldHook');
-    }
-  }
 }

 module.exports = TaskDial;
--- a/lib/tasks/dialogflow/index.js
+++ b/lib/tasks/dialogflow/index.js
@@ -58,13 +58,6 @@ class Dialogflow extends Task {
      this.vendor = this.data.tts.vendor || 'default';
      this.language = this.data.tts.language || 'default';
      this.voice = this.data.tts.voice || 'default';
-      this.speechSynthesisLabel = this.data.tts.label || 'default';
-
-      // fallback tts
-      this.fallbackVendor = this.data.tts.fallbackVendor || 'default';
-      this.fallbackLanguage = this.data.tts.fallbackLanguage || 'default';
-      this.fallbackVoice = this.data.tts.fallbackLanguage || 'default';
-      this.fallbackLabel = this.data.tts.fallbackLabel || 'default';
    }
    this.bargein = this.data.bargein;
  }
@@ -125,15 +118,8 @@ class Dialogflow extends Task {
        this.vendor = cs.speechSynthesisVendor;
        this.language = cs.speechSynthesisLanguage;
        this.voice = cs.speechSynthesisVoice;
-        this.speechSynthesisLabel = cs.speechSynthesisLabel;
      }
-      if (this.fallbackVendor === 'default') {
-        this.fallbackVendor = cs.fallbackSpeechSynthesisVendor;
-        this.fallbackLanguage = cs.fallbackSpeechSynthesisLanguage;
-        this.fallbackVoice = cs.fallbackSpeechSynthesisVoice;
-        this.fallbackLabel = cs.fallbackSpeechSynthesisLabel;
-      }
-      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts', this.speechSynthesisLabel);
+      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts');

      this.ep.addCustomEventListener('dialogflow::intent', this._onIntent.bind(this, ep, cs));
      this.ep.addCustomEventListener('dialogflow::transcription', this._onTranscription.bind(this, ep, cs));
@@ -235,7 +221,16 @@ class Dialogflow extends Task {
      }

      try {
-        const {filePath, servedFromCache} = await this._fallbackSynthAudio(cs, intent, stats, synthAudio);
+        const obj = {
+          text: intent.fulfillmentText,
+          vendor: this.vendor,
+          language: this.language,
+          voice: this.voice,
+          salt: cs.callSid,
+          credentials: this.ttsCredentials
+        };
+        this.logger.debug({obj}, 'Dialogflow:_onIntent - playing message via tts');
+        const {filePath, servedFromCache} = await synthAudio(stats, obj);
        if (filePath) cs.trackTmpFile(filePath);
        if (!this.ttsCredentials && !servedFromCache) cs.billForTts(intent.fulfillmentText.length);

@@ -281,46 +276,6 @@ class Dialogflow extends Task {
    }
  }

-  async _fallbackSynthAudio(cs, intent, stats, synthAudio) {
-    try {
-      const obj = {
-        account_sid: cs.accountSid,
-        text: intent.fulfillmentText,
-        vendor: this.vendor,
-        language: this.language,
-        voice: this.voice,
-        salt: cs.callSid,
-        credentials: this.ttsCredentials
-      };
-      this.logger.debug({obj}, 'Dialogflow:_onIntent - playing message via tts');
-
-      return await synthAudio(stats, obj);
-    } catch (error) {
-      this.logger.info({error}, 'Failed to synthesize audio from primary vendor');
-
-      try {
-        if (this.fallbackVendor) {
-          const credentials = cs.getSpeechCredentials(this.fallbackVendor, 'tts', this.fallbackLabel);
-          const obj = {
-            account_sid: cs.accountSid,
-            text: intent.fulfillmentText,
-            vendor: this.fallbackVendor,
-            language: this.fallbackLanguage,
-            voice: this.fallbackVoice,
-            salt: cs.callSid,
-            credentials
-          };
-          this.logger.debug({obj}, 'Dialogflow:_onIntent - playing message via fallback tts');
-          return await synthAudio(stats, obj);
-        }
-      } catch (err) {
-        this.logger.info({err}, 'Failed to synthesize audio from falllback vendor');
-        throw err;
-      }
-      throw error;
-    }
-  }
-
  /**
   * A transcription - either interim or final - has been returned.
   * If we are doing barge-in based on hotword detection, check for the hotword or phrase.
--- a/lib/tasks/enqueue.js
+++ b/lib/tasks/enqueue.js
@@ -18,7 +18,6 @@ class TaskEnqueue extends Task {
    this.preconditions = TaskPreconditions.Endpoint;

    this.queueName = this.data.name;
-    this.priority = this.data.priority;
    this.waitHook = this.data.waitHook;

    this.emitter = new Emitter();
@@ -71,22 +70,12 @@ class TaskEnqueue extends Task {
  }

  async _addToQueue(cs, dlg) {
-    const {addToSortedSet, sortedSetLength} = cs.srf.locals.dbHelpers;
+    const {pushBack} = cs.srf.locals.dbHelpers;
    const url = getUrl(cs);
    this.waitStartTime = Date.now();
    this.logger.debug({queue: this.queueName, url}, 'pushing url onto queue');
-    if (this.priority < 0) {
-      this.logger.warn(`priority ${this.priority} is invalid, need to be non-negative integer,
-      999 will be used for priority`);
-    }
-    let members = await addToSortedSet(this.queueName, url, this.priority);
-    if (members === 1) {
-      this.logger.info('TaskEnqueue:_addToQueue: added to queue');
-    } else {
-      this.logger.info('TaskEnqueue:_addToQueue: failed to add to queue');
-    }
-    members = await sortedSetLength(this.queueName);
-
+    const members = await pushBack(this.queueName, url);
+    this.logger.info(`TaskEnqueue:_addToQueue: added to queue, length now ${members}`);
    this.notifyUrl = url;

    /* invoke account-level webhook for queue event notifications */
@@ -101,9 +90,9 @@ class TaskEnqueue extends Task {
  }

  async _removeFromQueue(cs) {
-    const {retrieveByPatternSortedSet, sortedSetLength} = cs.srf.locals.dbHelpers;
-    await retrieveByPatternSortedSet(this.queueName, `*${getUrl(cs)}`);
-    return await sortedSetLength(this.queueName);
+    const {removeFromList, lengthOfList} = cs.srf.locals.dbHelpers;
+    await removeFromList(this.queueName, getUrl(cs));
+    return await lengthOfList(this.queueName);
  }

  async performAction() {
@@ -290,13 +279,13 @@ class TaskEnqueue extends Task {
      this.emitter.emit('dequeue', opts);

      try {
-        const {sortedSetLength} = cs.srf.locals.dbHelpers;
-        const members = await sortedSetLength(this.queueName);
+        const {lengthOfList} = cs.srf.locals.dbHelpers;
+        const members = await lengthOfList(this.queueName);
        this.dequeued = true;
        cs.performQueueWebhook({
          event: 'leave',
          queue: this.data.name,
-          length: Math.max(members, 0),
+          length: Math.max(members - 1, 0),
          leaveReason: 'dequeued',
          leaveTime: Date.now(),
          dequeuer: opts.dequeuer
@@ -312,7 +301,7 @@ class TaskEnqueue extends Task {
  }

  async _playHook(cs, dlg, hook, allowed = [TaskName.Play, TaskName.Say, TaskName.Pause, TaskName.Leave]) {
-    const {sortedSetLength, sortedSetPositionByPattern} = cs.srf.locals.dbHelpers;
+    const {lengthOfList, getListPosition} = cs.srf.locals.dbHelpers;
    const b3 = this.getTracingPropagation();
    const httpHeaders = b3 && {b3};

@@ -324,14 +313,9 @@ class TaskEnqueue extends Task {
      queueTime: getElapsedTime(this.waitStartTime)
    };
    try {
-      const queueSize = await sortedSetLength(this.queueName);
-      const queuePosition = await sortedSetPositionByPattern(this.queueName, `*${this.notifyUrl}`);
-      Object.assign(params, {
-        queueSize,
-        queuePosition: queuePosition.length ? queuePosition[0] : 0,
-        callSid: this.cs.callSid,
-        callId: this.cs.callId,
-      });
+      const queueSize = await lengthOfList(this.queueName);
+      const queuePosition = await getListPosition(this.queueName, this.notifyUrl);
+      Object.assign(params, {queueSize, queuePosition});
    } catch (err) {
      this.logger.error({err}, `TaskEnqueue:_playHook error retrieving list info for queue ${this.queueName}`);
    }
--- a/lib/tasks/gather.js
+++ b/lib/tasks/gather.js
@@ -1,5 +1,7 @@
+const Task = require('./task');
 const {
  TaskName,
+  TaskPreconditions,
  GoogleTranscriptionEvents,
  NuanceTranscriptionEvents,
  AwsTranscriptionEvents,
@@ -10,14 +12,9 @@ const {
  NvidiaTranscriptionEvents,
  JambonzTranscriptionEvents
 } = require('../utils/constants');
-const {
-  JAMBONES_GATHER_EARLY_HINTS_MATCH,
-  JAMBONZ_GATHER_EARLY_HINTS_MATCH,
-  JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS,
-} = require('../config');
+
 const makeTask = require('./make_task');
 const assert = require('assert');
-const SttTask = require('./stt-task');

 const compileTranscripts = (logger, evt, arr) => {
  if (!Array.isArray(arr) || arr.length === 0) return;
@@ -29,9 +26,23 @@ const compileTranscripts = (logger, evt, arr) => {
  evt.alternatives[0].transcript = t.trim();
 };

-class TaskGather extends SttTask {
+class TaskGather extends Task {
  constructor(logger, opts, parentTask) {
-    super(logger, opts, parentTask);
+    super(logger, opts);
+    this.preconditions = TaskPreconditions.Endpoint;
+
+    const {
+      setChannelVarsForStt,
+      normalizeTranscription,
+      removeSpeechListeners,
+      setSpeechCredentialsAtRuntime,
+      compileSonioxTranscripts
+    } = require('../utils/transcription-utils')(logger);
+    this.setChannelVarsForStt = setChannelVarsForStt;
+    this.normalizeTranscription = normalizeTranscription;
+    this.removeSpeechListeners = removeSpeechListeners;
+    this.compileSonioxTranscripts = compileSonioxTranscripts;
+
    [
      'finishOnKey', 'input', 'numDigits', 'minDigits', 'maxDigits',
      'interDigitTimeout', 'partialResultHook', 'bargein', 'dtmfBargein',
@@ -47,18 +58,27 @@ class TaskGather extends SttTask {
    this.listenDuringPrompt = this.data.listenDuringPrompt === false ? false : true;
    this.minBargeinWordCount = this.data.minBargeinWordCount || 1;
    if (this.data.recognizer) {
+      const recognizer = this.data.recognizer;
+      this.vendor = recognizer.vendor;
+      this.language = recognizer.language;
+
+      /* let credentials be supplied in the recognizer object at runtime */
+      this.sttCredentials = setSpeechCredentialsAtRuntime(recognizer);
+
      /* continuous ASR (i.e. compile transcripts until a special timeout or dtmf key) */
-      this.asrTimeout = typeof this.data.recognizer.asrTimeout === 'number' ?
-        this.data.recognizer.asrTimeout * 1000 : 0;
-      if (this.asrTimeout > 0) this.asrDtmfTerminationDigit = this.data.recognizer.asrDtmfTerminationDigit;
+      this.asrTimeout = typeof recognizer.asrTimeout === 'number' ? recognizer.asrTimeout * 1000 : 0;
+      if (this.asrTimeout > 0) this.asrDtmfTerminationDigit = recognizer.asrDtmfTerminationDigit;
      this.isContinuousAsr = this.asrTimeout > 0;

      if (Array.isArray(this.data.recognizer.hints) &&
-        0 == this.data.recognizer.hints.length && JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS) {
+        0 == this.data.recognizer.hints.length && process.env.JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS) {
        logger.debug('Gather: an empty hints array was supplied, so we will mask global hints');
        this.maskGlobalSttHints = true;
      }
+      this.data.recognizer.hints = this.data.recognizer.hints || [];
+      this.data.recognizer.altLanguages = this.data.recognizer.altLanguages || [];
    }
+    else this.data.recognizer = {hints: [], altLanguages: []};

    this.digitBuffer = '';
    this._earlyMedia = this.data.earlyMedia === true;
@@ -73,6 +93,11 @@ class TaskGather extends SttTask {

    /* buffer speech for continuous asr */
    this._bufferedTranscripts = [];
+
+    /* buffer for soniox transcripts */
+    this._sonioxTranscripts = [];
+
+    this.parentTask = parentTask;
    this.partialTranscriptsCount = 0;
  }

@@ -108,6 +133,7 @@ class TaskGather extends SttTask {
    this.logger.debug({options: this.data}, 'Gather:exec');
    await super.exec(cs);
    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
+    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;

    if (cs.hasGlobalSttHints && !this.maskGlobalSttHints) {
      const {hints, hintsBoost} = cs.globalSttHints;
@@ -121,7 +147,7 @@ class TaskGather extends SttTask {
    }
    if (cs.hasAltLanguages) {
      this.data.recognizer.altLanguages = this.data.recognizer.altLanguages.concat(cs.altLanguages);
-      this.logger.debug({altLanguages: this.data.recognizer?.altLanguages},
+      this.logger.debug({altLanguages: this.altLanguages},
        'Gather:exec - applying altLanguages');
    }
    if (cs.hasGlobalSttPunctuation && !this.data.recognizer.punctuation) {
@@ -136,7 +162,7 @@ class TaskGather extends SttTask {
        asrDtmfTerminationDigit: this.asrDtmfTerminationDigit
      }, 'Gather:exec - enabling continuous ASR since it is turned on for the session');
    }
-
+    const {JAMBONZ_GATHER_EARLY_HINTS_MATCH, JAMBONES_GATHER_EARLY_HINTS_MATCH} = process.env;
    if ((JAMBONZ_GATHER_EARLY_HINTS_MATCH || JAMBONES_GATHER_EARLY_HINTS_MATCH) && this.needsStt &&
      !this.isContinuousAsr &&
      this.data.recognizer?.hints?.length > 0 && this.data.recognizer?.hints?.length <= 10) {
@@ -154,59 +180,57 @@ class TaskGather extends SttTask {
      this.language = cs.speechRecognizerLanguage;
      if (this.data.recognizer) this.data.recognizer.language = this.language;
    }
-    if ('default' === this.label || !this.label) {
-      this.label = cs.speechRecognizerLabel;
-      if (this.data.recognizer) this.data.recognizer.label = this.label;
-    }
-    // Fallback options
-    if ('default' === this.fallbackVendor || !this.fallbackVendor) {
-      this.fallbackVendor = cs.fallbackSpeechRecognizerVendor;
-      if (this.data.recognizer) this.data.recognizer.fallbackVendor = this.fallbackVendor;
-    }
-    if ('default' === this.fallbackLanguage || !this.fallbackLanguage) {
-      this.fallbackLanguage = cs.fallbackSpeechRecognizerLanguage;
-      if (this.data.recognizer) this.data.recognizer.fallbackLanguage = this.fallbackLanguage;
-    }
-    if ('default' === this.fallbackLabel || !this.fallbackLabel) {
-      this.fallbackLabel = cs.fallbackSpeechRecognizerLabel;
-      if (this.data.recognizer) this.data.recognizer.fallbackLabel = this.fallbackLabel;
-    }
    if (!this.data.recognizer.vendor) {
      this.data.recognizer.vendor = this.vendor;
    }
-
+    if (this.needsStt && !this.sttCredentials) this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');
    if (this.needsStt && !this.sttCredentials) {
-      try {
-        this.sttCredentials = await this._initSpeechCredentials(cs, this.vendor, this.label);
-      } catch (error) {
-        if (this.fallbackVendor && this.isHandledByPrimaryProvider) {
-          await this._fallback();
-        } else {
-          throw error;
-        }
-      }
+      const {writeAlerts, AlertType} = cs.srf.locals;
+      this.logger.info(`TaskGather:exec - ERROR stt using ${this.vendor} requested but creds not supplied`);
+      writeAlerts({
+        account_sid: cs.accountSid,
+        alert_type: AlertType.STT_NOT_PROVISIONED,
+        vendor: this.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 ${this.vendor} have been configured`
+      });
+      this.notifyTaskDone();
+      throw new Error(`No speech-to-text service credentials for ${this.vendor} have been configured`);
    }

-    const startListening = async(cs, ep) => {
+    if (this.vendor === 'nuance' && this.sttCredentials.client_id) {
+      /* get nuance access token */
+      const {client_id, secret} = this.sttCredentials;
+      const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
+      this.logger.debug({client_id}, `Gather:exec - got nuance access token ${servedFromCache ? 'from cache' : ''}`);
+      this.sttCredentials = {...this.sttCredentials, access_token};
+    }
+    else if (this.vendor == 'ibm' && this.sttCredentials.stt_api_key) {
+      /* get ibm access token */
+      const {stt_api_key, stt_region} = this.sttCredentials;
+      const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
+      this.logger.debug({stt_api_key}, `Gather:exec - got ibm access token ${servedFromCache ? 'from cache' : ''}`);
+      this.sttCredentials = {...this.sttCredentials, access_token, stt_region};
+    }
+    const startListening = (cs, ep) => {
      this._startTimer();
      if (this.isContinuousAsr && 0 === this.timeout) this._startAsrTimer();
      if (this.input.includes('speech') && !this.listenDuringPrompt) {
-        try {
-          await this._initSpeech(cs, ep);
-          if (this.killed) {
-            this.logger.info('Gather:exec - task was quickly killed so do not transcribe');
-            return;
-          }
-          this._startTranscribing(ep);
-          return updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
-        } catch (e) {
-          if (this.fallbackVendor && this.isHandledByPrimaryProvider) {
-            await this._fallback();
-            startListening(cs, ep);
-          } else {
-            this.logger.error({error: e}, 'error in initSpeech');
-          }
-        }
+        this._initSpeech(cs, ep)
+          .then(() => {
+            if (this.killed) {
+              this.logger.info('Gather:exec - task was quickly killed so do not transcribe');
+              return;
+            }
+            this._startTranscribing(ep);
+            return updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
+          })
+          .catch((err) => {
+            this.logger.error({err}, 'error in initSpeech');
+          });
      }
    };

@@ -676,22 +700,8 @@ class TaskGather extends SttTask {
  _onJambonzConnect(_cs, _ep) {
    this.logger.debug('TaskGather:_onJambonzConnect');
  }
-  async _onJambonzError(cs, _ep, evt) {
+  _onJambonzError(cs, _ep, evt) {
    this.logger.info({evt}, 'TaskGather:_onJambonzError');
-    if (this.isHandledByPrimaryProvider && this.fallbackVendor) {
-      _ep.stopTranscription({vendor: this.vendor})
-        .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 {
-        await this._fallback();
-        await this._initSpeech(cs, _ep);
-        this._startTranscribing(_ep);
-        updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
-        return;
-      } catch (error) {
-        this.logger.info({error}, `There is error while falling back to ${this.fallbackVendor}`);
-      }
-    }
    const {writeAlerts, AlertType} = cs.srf.locals;

    if (this.vendor === 'nuance') {
@@ -803,11 +813,7 @@ class TaskGather extends SttTask {
      this.logger.debug({evt}, 'TaskGather:resolve buffered results');
    }

-    this.span.setAttributes({
-      channel: 1,
-      'stt.resolve': reason,
-      'stt.result': JSON.stringify(evt)
-    });
+    this.span.setAttributes({'stt.resolve': reason, 'stt.result': JSON.stringify(evt)});
    if (this.needsStt && this.ep && this.ep.connected) {
      this.ep.stopTranscription({vendor: this.vendor})
        .catch((err) => this.logger.error({err}, 'Error stopping transcription'));
--- a/lib/tasks/lex.js
+++ b/lib/tasks/lex.js
@@ -25,13 +25,6 @@ class Lex extends Task {
      this.vendor = this.data.tts.vendor || 'default';
      this.language = this.data.tts.language || 'default';
      this.voice = this.data.tts.voice || 'default';
-      this.speechCredentialLabel = this.data.tts.label || 'default';
-
-      // fallback tts
-      this.fallbackVendor = this.data.tts.fallbackVendor || 'default';
-      this.fallbackLanguage = this.data.tts.fallbackLanguage || 'default';
-      this.fallbackVoice = this.data.tts.fallbackLanguage || 'default';
-      this.fallbackLabel = this.data.tts.fallbackLabel || 'default';
    }

    this.botName = `${this.bot}:${this.alias}:${this.region}`;
@@ -109,16 +102,8 @@ class Lex extends Task {
        this.vendor = cs.speechSynthesisVendor;
        this.language = cs.speechSynthesisLanguage;
        this.voice = cs.speechSynthesisVoice;
-        this.speechCredentialLabel = cs.speechSynthesisLabel;
      }
-      if (this.fallbackVendor === 'default') {
-        this.fallbackVendor = cs.fallbackSpeechSynthesisVendor;
-        this.fallbackLanguage = cs.fallbackSpeechSynthesisLanguage;
-        this.fallbackVoice = cs.fallbackSpeechSynthesisVoice;
-        this.fallbackLabel = cs.fallbackSpeechSynthesisLabel;
-      }
-
-      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts', this.speechCredentialLabel);
+      this.ttsCredentials = cs.getSpeechCredentials(this.vendor, 'tts');

      this.ep.addCustomEventListener('lex::intent', this._onIntent.bind(this, ep, cs));
      this.ep.addCustomEventListener('lex::transcription', this._onTranscription.bind(this, ep, cs));
@@ -183,41 +168,6 @@ class Lex extends Task {
    }
  }

-  async _fallbackSynthAudio(cs, msg, stats, synthAudio) {
-    try {
-      const {filePath} = await synthAudio(stats, {
-        account_sid: cs.accountSid,
-        text: msg,
-        vendor: this.vendor,
-        language: this.language,
-        voice: this.voice,
-        salt: cs.callSid,
-        credentials: this.ttsCredentials
-      });
-
-      return filePath;
-    } catch (error) {
-      this.logger.info({error}, 'failed to synth audio from primary vendor');
-      if (this.fallbackVendor) {
-        try {
-          const credential = cs.getSpeechCredentials(this.fallbackVendor, 'tts', this.fallbackLabel);
-          const {filePath} = await synthAudio(stats, {
-            account_sid: cs.accountSid,
-            text: msg,
-            vendor: this.fallbackVendor,
-            language: this.fallbackLanguage,
-            voice: this.fallbackVoice,
-            salt: cs.callSid,
-            credentials: credential
-          });
-          return filePath;
-        } catch (err) {
-          this.logger.info({err}, 'failed to synth audio from fallback vendor');
-        }
-      }
-    }
-  }
-
  /**
   * @param {*} evt - event data
   */
@@ -237,7 +187,15 @@ class Lex extends Task {

        try {
          this.logger.debug(`tts with ${this.vendor} ${this.voice}`);
-          const filePath = await this._fallbackSynthAudio(cs, msg, stats, synthAudio);
+          // eslint-disable-next-line no-unused-vars
+          const {filePath, servedFromCache} = await synthAudio(stats, {
+            text: msg,
+            vendor: this.vendor,
+            language: this.language,
+            voice: this.voice,
+            salt: cs.callSid,
+            credentials: this.ttsCredentials
+          });
          if (filePath) cs.trackTmpFile(filePath);

          if (this.events.includes('start-play')) {
--- a/lib/tasks/listen.js
+++ b/lib/tasks/listen.js
@@ -3,12 +3,10 @@ const {TaskName, TaskPreconditions, ListenEvents, ListenStatus} = require('../ut
 const makeTask = require('./make_task');
 const moment = require('moment');
 const MAX_PLAY_AUDIO_QUEUE_SIZE = 10;
-const DTMF_SPAN_NAME = 'dtmf';

 class TaskListen extends Task {
  constructor(logger, opts, parentTask) {
    super(logger, opts);
-    this.disableBidirectionalAudio = opts.disableBidirectionalAudio;
    this.preconditions = TaskPreconditions.Endpoint;

    [
@@ -31,10 +29,6 @@ class TaskListen extends Task {

  get name() { return TaskName.Listen; }

-  set bugname(name) { this._bugname = name; }
-
-  set ignoreCustomerData(val) { this._ignoreCustomerData = val; }
-
  async exec(cs, {ep}) {
    await super.exec(cs);
    this.ep = ep;
@@ -71,8 +65,7 @@ class TaskListen extends Task {
    if (this.ep && this.ep.connected) {
      this.logger.debug('TaskListen:kill closing websocket');
      try {
-        const args = this._bugname ? [this._bugname] : [];
-        await this.ep.forkAudioStop(...args);
+        await this.ep.forkAudioStop();
        this.logger.debug('TaskListen:kill successfully closed websocket');
      } catch (err) {
        this.logger.info(err, 'TaskListen:kill');
@@ -92,16 +85,13 @@ class TaskListen extends Task {

  async updateListen(status) {
    if (!this.killed && this.ep && this.ep.connected) {
-      const args = this._bugname ? [this._bugname] : [];
      this.logger.info(`TaskListen:updateListen status ${status}`);
      switch (status) {
        case ListenStatus.Pause:
-          await this.ep.forkAudioPause(...args)
-            .catch((err) => this.logger.info(err, 'TaskListen: error pausing audio'));
+          await this.ep.forkAudioPause().catch((err) => this.logger.info(err, 'TaskListen: error pausing audio'));
          break;
        case ListenStatus.Resume:
-          await this.ep.forkAudioResume(...args)
-            .catch((err) => this.logger.info(err, 'TaskListen: error resuming audio'));
+          await this.ep.forkAudioResume().catch((err) => this.logger.info(err, 'TaskListen: error resuming audio'));
          break;
      }
    }
@@ -114,13 +104,9 @@ class TaskListen extends Task {

  async _startListening(cs, ep) {
    this._initListeners(ep);
-    const ci = this.nested ? this.parentTask.sd.callInfo : cs.callInfo.toJSON();
-    if (this._ignoreCustomerData) {
-      delete ci.customerData;
-    }
    const metadata = Object.assign(
      {sampleRate: this.sampleRate, mixType: this.mixType},
-      ci,
+      this.nested ? this.parentTask.sd.callInfo : cs.callInfo.toJSON(),
      this.metadata);
    if (this.hook.auth) {
      this.logger.debug({username: this.hook.auth.username, password: this.hook.auth.password},
@@ -134,7 +120,6 @@ class TaskListen extends Task {
      wsUrl: this.hook.url,
      mixType: this.mixType,
      sampling: this.sampleRate,
-      ...(this._bugname && {bugname: this._bugname}),
      metadata
    });
    this.recordStartTime = moment();
@@ -155,7 +140,7 @@ class TaskListen extends Task {
    }

    /* support bi-directional audio */
-    if (!this.disableBidirectionalAudio) {
+    if (!this.disableBiDirectionalAudio) {
      ep.addCustomEventListener(ListenEvents.PlayAudio, this._onPlayAudio.bind(this, ep));
    }
    ep.addCustomEventListener(ListenEvents.KillAudio, this._onKillAudio.bind(this, ep));
@@ -176,25 +161,12 @@ class TaskListen extends Task {
  }

  _onDtmf(ep, evt) {
-    const {dtmf, duration} = evt;
-    this.logger.debug({evt}, `TaskListen:_onDtmf received dtmf ${dtmf}`);
+    this.logger.debug({evt}, `TaskListen:_onDtmf received dtmf ${evt.dtmf}`);
    if (this.passDtmf && this.ep?.connected) {
-      const obj = {event: 'dtmf', dtmf, duration};
-      const args = this._bugname ? [this._bugname, obj] : [obj];
-      this.ep.forkAudioSendText(...args)
+      const obj = {event: 'dtmf', dtmf: evt.dtmf, duration: evt.duration};
+      this.ep.forkAudioSendText(obj)
        .catch((err) => this.logger.info({err}, 'TaskListen:_onDtmf error sending dtmf'));
    }
-
-    /* add a child span for the dtmf event */
-    const msDuration = Math.floor((duration / 8000) * 1000);
-    const {span} = this.startChildSpan(`${DTMF_SPAN_NAME}:${dtmf}`);
-    span.setAttributes({
-      channel: 1,
-      dtmf,
-      duration: `${msDuration}ms`
-    });
-    span.end();
-
    if (evt.dtmf === this.finishOnKey) {
      this.logger.info(`TaskListen:_onDtmf terminating task due to dtmf ${evt.dtmf}`);
      this.results.digits = evt.dtmf;
@@ -220,15 +192,7 @@ class TaskListen extends Task {
    try {
      const results = await ep.play(evt.file);
      logger.debug(`Finished playing file, result: ${JSON.stringify(results)}`);
-      const obj = {
-        type: 'playDone',
-        data: {
-          id: evt.id,
-          ...results
-        }
-      };
-      const args = this._bugname ? [this._bugname, obj] : [obj];
-      ep.forkAudioSendText(...args);
+      ep.forkAudioSendText({type: 'playDone', data: Object.assign({id: evt.id}, results)});
    } catch (err) {
      logger.error({err}, 'Error playing file');
    }
--- a/lib/tasks/message.js
+++ b/lib/tasks/message.js
@@ -2,7 +2,7 @@ const Task = require('./task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
 const bent = require('bent');
 const uuidv4 = require('uuid-random');
-const {K8S} = require('../config');
+
 class TaskMessage extends Task {
  constructor(logger, opts) {
    super(logger, opts);
@@ -42,7 +42,7 @@ class TaskMessage extends Task {
      }
      if (gw) {
        this.logger.info({gw, accountSid}, 'Message:exec - using smpp to send message');
-        url = K8S ? 'http://smpp' : getSmpp();
+        url = process.env.K8S ? 'http://smpp' : getSmpp();
        relativeUrl = '/sms';
        payload = {
          ...payload,
--- a/lib/tasks/rest_dial.js
+++ b/lib/tasks/rest_dial.js
@@ -11,7 +11,6 @@ class TaskRestDial extends Task {
    super(logger, opts);

    this.from = this.data.from;
-    this.callerName = this.data.callerName;
    this.fromHost = this.data.fromHost;
    this.to = this.data.to;
    this.call_hook = this.data.call_hook;
@@ -23,38 +22,23 @@ class TaskRestDial extends Task {

  get name() { return TaskName.RestDial; }

-  set appJson(app_json) {
-    this.app_json = app_json;
-  }
-
  /**
   * INVITE has just been sent at this point
  */
  async exec(cs) {
    await super.exec(cs);
-    this.cs = cs;
    this.canCancel = true;

-    if (this.data.amd) {
-      this.startAmd = cs.startAmd;
-      this.stopAmd = cs.stopAmd;
-      this.on('amd', this._onAmdEvent.bind(this, cs));
-    }
-
    this._setCallTimer();
    await this.awaitTaskDone();
  }

-  turnOffAmd() {
-    if (this.callSession.ep && this.callSession.ep.amd) this.stopAmd(this.callSession.ep, this);
-  }
-
  kill(cs) {
    super.kill(cs);
    this._clearCallTimer();
-    if (this.canCancel) {
+    if (this.canCancel && cs?.req) {
      this.canCancel = false;
-      cs?.req?.cancel();
+      cs.req.cancel();
    }
    this.notifyTaskDone();
  }
@@ -63,13 +47,12 @@ class TaskRestDial extends Task {
    this.canCancel = false;
    const cs = this.callSession;
    cs.setDialog(dlg);
-    this.logger.debug('TaskRestDial:_onConnect - call connected');

    try {
      const b3 = this.getTracingPropagation();
      const httpHeaders = b3 && {b3};
      const params = {
-        ...(cs.callInfo.toJSON()),
+        ...cs.callInfo,
        defaults: {
          synthesizer: {
            vendor: cs.speechSynthesisVendor,
@@ -82,21 +65,7 @@ class TaskRestDial extends Task {
          }
        }
      };
-      if (this.startAmd) {
-        try {
-          this.startAmd(this.callSession, this.callSession.ep, this, this.data.amd);
-        } catch (err) {
-          this.logger.info({err}, 'Rest:dial:Call established - Error calling startAmd');
-        }
-      }
-      let tasks;
-      if (this.app_json) {
-        this.logger.debug('TaskRestDial: using app_json from task data');
-        tasks = JSON.parse(this.app_json);
-      } else {
-        this.logger.debug({call_hook: this.call_hook}, 'TaskRestDial: retrieving application');
-        tasks = await cs.requestor.request('session:new', this.call_hook, params, httpHeaders);
-      }
+      const tasks = await cs.requestor.request('session:new', this.call_hook, params, httpHeaders);
      if (tasks && Array.isArray(tasks)) {
        this.logger.debug({tasks: tasks}, `TaskRestDial: replacing application with ${tasks.length} tasks`);
        cs.replaceApplication(normalizeJambones(this.logger, tasks).map((tdata) => makeTask(this.logger, tdata)));
@@ -128,19 +97,7 @@ class TaskRestDial extends Task {
  _onCallTimeout() {
    this.logger.debug('TaskRestDial: timeout expired without answer, killing task');
    this.timer = null;
-    if (this.canCancel) {
-      this.canCancel = false;
-      this.cs?.req?.cancel();
-    }
-  }
-
-  _onAmdEvent(cs, evt) {
-    this.logger.info({evt}, 'Rest:dial:_onAmdEvent');
-    const {actionHook} = this.data.amd;
-    this.performHook(cs, actionHook, evt)
-      .catch((err) => {
-        this.logger.error({err}, 'Rest:dial:_onAmdEvent - error calling actionHook');
-      });
+    this.kill();
  }
 }

--- a/lib/tasks/say.js
+++ b/lib/tasks/say.js
@@ -36,8 +36,6 @@ class TaskSay extends Task {
    this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
    this.synthesizer = this.data.synthesizer || {};
    this.disableTtsCache = this.data.disableTtsCache;
-    this.options = this.synthesizer.options || {};
-    this.isHandledByPrimaryProvider = true;
  }

  get name() { return TaskName.Say; }
@@ -50,15 +48,26 @@ class TaskSay extends Task {
    return `${this.name}{${this.text[0]}}`;
  }

-  async _synthesizeWithSpecificVendor(cs, ep, {vendor, language, voice, label}) {
+  async exec(cs, {ep}) {
+    await super.exec(cs);
+
    const {srf} = cs;
    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, srf);
    const {writeAlerts, AlertType, stats} = srf.locals;
    const {synthAudio} = srf.locals.dbHelpers;
+    const vendor = this.synthesizer.vendor && this.synthesizer.vendor !== 'default' ?
+      this.synthesizer.vendor :
+      cs.speechSynthesisVendor;
+    const language = this.synthesizer.language && this.synthesizer.language !== 'default' ?
+      this.synthesizer.language :
+      cs.speechSynthesisLanguage ;
+    let voice =  this.synthesizer.voice && this.synthesizer.voice !== 'default' ?
+      this.synthesizer.voice :
+      cs.speechSynthesisVoice;
    const engine = this.synthesizer.engine || 'standard';
    const salt = cs.callSid;
+    const credentials = cs.getSpeechCredentials(vendor, 'tts');

-    let credentials = cs.getSpeechCredentials(vendor, 'tts', label);
    /* parse Nuance voices into name and model */
    let model;
    if (vendor === 'nuance' && voice) {
@@ -69,17 +78,8 @@ class TaskSay extends Task {
      }
    }

-    /* 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;
-    }
-
    this.logger.info({vendor, language, voice, model}, 'TaskSay:exec');
+    this.ep = ep;
    try {
      if (!credentials) {
        writeAlerts({
@@ -109,7 +109,6 @@ class TaskSay extends Task {
        });
        try {
          const {filePath, servedFromCache, rtt} = await synthAudio(stats, {
-            account_sid: cs.accountSid,
            text,
            vendor,
            language,
@@ -149,83 +148,31 @@ class TaskSay extends Task {
            detail: err.message
          }).catch((err) => this.logger.info({err}, 'Error generating alert for tts failure'));
          this.notifyError({msg: 'TTS error', details: err.message || err});
-          throw err;
+          return;
        }
      };

      const arr = this.text.map((t) => generateAudio(t));
-      return (await Promise.all(arr)).filter((fp) => fp && fp.length);
+      const filepath = (await Promise.all(arr)).filter((fp) => fp && fp.length);
+      this.notifyStatus({event: 'start-playback'});
+
+      while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep?.connected) {
+        let segment = 0;
+        while (!this.killed && segment < filepath.length) {
+          if (cs.isInConference) {
+            const {memberId, confName, confUuid} = cs;
+            await this.playToConfMember(this.ep, memberId, confName, confUuid, filepath[segment]);
+          }
+          else {
+            this.logger.debug(`Say:exec sending command to play file ${filepath[segment]}`);
+            await ep.play(filepath[segment]);
+            this.logger.debug(`Say:exec completed play file ${filepath[segment]}`);
+          }
+          segment++;
+        }
+      }
    } catch (err) {
      this.logger.info(err, 'TaskSay:exec error');
-      throw err;
-    }
-
-  }
-
-  async exec(cs, {ep}) {
-    await super.exec(cs);
-    this.ep = ep;
-
-    const vendor = this.synthesizer.vendor && this.synthesizer.vendor !== 'default' ?
-      this.synthesizer.vendor :
-      cs.speechSynthesisVendor;
-    const language = this.synthesizer.language && this.synthesizer.language !== 'default' ?
-      this.synthesizer.language :
-      cs.speechSynthesisLanguage ;
-    const voice =  this.synthesizer.voice && this.synthesizer.voice !== 'default' ?
-      this.synthesizer.voice :
-      cs.speechSynthesisVoice;
-    const label = this.synthesizer.label && this.synthesizer.label !== 'default' ?
-      this.synthesizer.label :
-      cs.speechSynthesisLabel;
-
-    const fallbackVendor = this.synthesizer.fallbackVendor && this.synthesizer.fallbackVendor !== 'default' ?
-      this.synthesizer.fallbackVendor :
-      cs.fallbackSpeechSynthesisVendor;
-    const fallbackLanguage = this.synthesizer.fallbackLanguage && this.synthesizer.fallbackLanguage !== 'default' ?
-      this.synthesizer.fallbackLanguage :
-      cs.fallbackSpeechSynthesisLanguage ;
-    const fallbackVoice =  this.synthesizer.fallbackVoice && this.synthesizer.fallbackVoice !== 'default' ?
-      this.synthesizer.fallbackVoice :
-      cs.fallbackSpeechSynthesisVoice;
-    const fallbackLabel = this.synthesizer.fallbackLabel && this.synthesizer.fallbackLabel !== 'default' ?
-      this.synthesizer.fallbackLabel :
-      cs.fallbackSpeechSynthesisLabel;
-
-    let filepath;
-    try {
-      filepath = await this._synthesizeWithSpecificVendor(cs, ep, {vendor, language, voice, label});
-    } catch (error) {
-      if (fallbackVendor && this.isHandledByPrimaryProvider) {
-        this.isHandledByPrimaryProvider = false;
-        this.logger.info(`Synthesize error, fallback to ${fallbackVendor}`);
-        filepath = await this._synthesizeWithSpecificVendor(cs, ep,
-          {
-            vendor: fallbackVendor,
-            language: fallbackLanguage,
-            voice: fallbackVoice,
-            label: fallbackLabel
-          });
-      } else {
-        throw error;
-      }
-    }
-    this.notifyStatus({event: 'start-playback'});
-
-    while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep?.connected) {
-      let segment = 0;
-      while (!this.killed && segment < filepath.length) {
-        if (cs.isInConference) {
-          const {memberId, confName, confUuid} = cs;
-          await this.playToConfMember(this.ep, memberId, confName, confUuid, filepath[segment]);
-        }
-        else {
-          this.logger.debug(`Say:exec sending command to play file ${filepath[segment]}`);
-          await ep.play(filepath[segment]);
-          this.logger.debug(`Say:exec completed play file ${filepath[segment]}`);
-        }
-        segment++;
-      }
    }
    this.emit('playDone');
  }
--- a/lib/tasks/stt-task.js
+++ b/lib/tasks/stt-task.js
@@ -1,100 +0,0 @@
-const Task = require('./task');
-const assert = require('assert');
-const { TaskPreconditions } = require('../utils/constants');
-
-class SttTask extends Task {
-
-  constructor(logger, data, parentTask) {
-    super(logger, data);
-    this.parentTask = parentTask;
-
-    this.preconditions = TaskPreconditions.Endpoint;
-
-    const {
-      setChannelVarsForStt,
-      normalizeTranscription,
-      removeSpeechListeners,
-      setSpeechCredentialsAtRuntime,
-      compileSonioxTranscripts
-    } = require('../utils/transcription-utils')(logger);
-    this.setChannelVarsForStt = setChannelVarsForStt;
-    this.normalizeTranscription = normalizeTranscription;
-    this.removeSpeechListeners = removeSpeechListeners;
-    this.compileSonioxTranscripts = compileSonioxTranscripts;
-
-    this.isHandledByPrimaryProvider = true;
-    if (this.data.recognizer) {
-      const recognizer = this.data.recognizer;
-      this.vendor = recognizer.vendor;
-      this.language = recognizer.language;
-      this.label = recognizer.label;
-
-      //fallback
-      this.fallbackVendor = recognizer.fallbackVendor || 'default';
-      this.fallbackLanguage = recognizer.fallbackLanguage || 'default';
-      this.fallbackLabel = recognizer.fallbackLabel || 'default';
-
-      /* let credentials be supplied in the recognizer object at runtime */
-      this.sttCredentials = setSpeechCredentialsAtRuntime(recognizer);
-    } else {
-      this.data.recognizer = {hints: [], altLanguages: []};
-    }
-
-    /* buffer for soniox transcripts */
-    this._sonioxTranscripts = [];
-
-  }
-
-  async _initSpeechCredentials(cs, vendor, label) {
-    const {getNuanceAccessToken, getIbmAccessToken} = this.cs.srf.locals.dbHelpers;
-    let credentials = cs.getSpeechCredentials(vendor, 'stt', label);
-
-    if (!credentials) {
-      const {writeAlerts, AlertType} = cs.srf.locals;
-      this.logger.info(`ERROR stt using ${vendor} requested but creds not supplied`);
-      writeAlerts({
-        account_sid: cs.accountSid,
-        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`);
-    }
-
-    if (vendor === 'nuance' && credentials.client_id) {
-      /* get nuance access token */
-      const {client_id, secret} = credentials;
-      const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
-      this.logger.debug({client_id}, `got nuance access token ${servedFromCache ? 'from cache' : ''}`);
-      credentials = {...credentials, access_token};
-    }
-    else if (vendor == 'ibm' && credentials.stt_api_key) {
-      /* get ibm access token */
-      const {stt_api_key, stt_region} = credentials;
-      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};
-    }
-    return credentials;
-  }
-
-  async _fallback() {
-    assert(this.fallbackVendor, 'fallback failed without fallbackVendor configuration');
-    this.isHandledByPrimaryProvider = false;
-    this.logger.info(`Failed to use primary STT provider, fallback to ${this.fallbackVendor}`);
-    this.vendor = this.fallbackVendor;
-    this.language = this.fallbackLanguage;
-    this.label = this.fallbackLabel;
-    this.data.recognizer.vendor = this.vendor;
-    this.data.recognizer.language = this.language;
-    this.data.recognizer.label = this.label;
-    this.sttCredentials = await this._initSpeechCredentials(this.cs, this.vendor, this.label);
-  }
-}
-
-module.exports = SttTask;
--- a/lib/tasks/task.js
+++ b/lib/tasks/task.js
@@ -155,7 +155,7 @@ class Task extends Emitter {
    if (this.actionHook) {
      const type = this.name === TaskName.Redirect ? 'session:redirect' : 'verb:hook';
      const params = results ? Object.assign(this.cs.callInfo.toJSON(), results) : this.cs.callInfo.toJSON();
-      const span = this.startSpan(`${type} (${this.actionHook})`);
+      const span = this.startSpan(type, {'hook.url': this.actionHook});
      const b3 = this.getTracingPropagation('b3', span);
      const httpHeaders = b3 && {b3};
      span.setAttributes({'http.body': JSON.stringify(params)});
--- a/lib/tasks/transcribe.js
+++ b/lib/tasks/transcribe.js
@@ -1,6 +1,7 @@
-const assert = require('assert');
+const Task = require('./task');
 const {
  TaskName,
+  TaskPreconditions,
  GoogleTranscriptionEvents,
  NuanceTranscriptionEvents,
  AwsTranscriptionEvents,
@@ -9,33 +10,45 @@ const {
  SonioxTranscriptionEvents,
  IbmTranscriptionEvents,
  NvidiaTranscriptionEvents,
-  JambonzTranscriptionEvents,
-  TranscribeStatus
+  JambonzTranscriptionEvents
 } = require('../utils/constants');
 const { normalizeJambones } = require('@jambonz/verb-specifications');
-const SttTask = require('./stt-task');

-const STT_LISTEN_SPAN_NAME = 'stt-listen';
-
-class TaskTranscribe extends SttTask {
+class TaskTranscribe extends Task {
  constructor(logger, opts, parentTask) {
-    super(logger, opts, parentTask);
+    super(logger, opts);
+    this.preconditions = TaskPreconditions.Endpoint;
+    this.parentTask = parentTask;
+
+    const {
+      setChannelVarsForStt,
+      normalizeTranscription,
+      removeSpeechListeners,
+      setSpeechCredentialsAtRuntime,
+      compileSonioxTranscripts
+    } = require('../utils/transcription-utils')(logger);
+    this.setChannelVarsForStt = setChannelVarsForStt;
+    this.normalizeTranscription = normalizeTranscription;
+    this.removeSpeechListeners = removeSpeechListeners;
+    this.compileSonioxTranscripts = compileSonioxTranscripts;

    this.transcriptionHook = this.data.transcriptionHook;
    this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);

-    if (this.data.recognizer) {
-      this.interim = !!this.data.recognizer.interim;
-      this.separateRecognitionPerChannel = this.data.recognizer.separateRecognitionPerChannel;
-    }
+    const recognizer = this.data.recognizer;
+    this.vendor = recognizer.vendor;
+    this.language = recognizer.language;
+    this.interim = !!recognizer.interim;
+    this.separateRecognitionPerChannel = recognizer.separateRecognitionPerChannel;

-    this.childSpan = [null, null];
+    /* let credentials be supplied in the recognizer object at runtime */
+    this.sttCredentials = setSpeechCredentialsAtRuntime(recognizer);

-    // Continuos asr timeout
-    this.asrTimeout = typeof this.data.recognizer.asrTimeout === 'number' ? this.data.recognizer.asrTimeout * 1000 : 0;
-    this.isContinuousAsr = this.asrTimeout > 0;
-    /* buffer speech for continuous asr */
-    this._bufferedTranscripts = [];
+    /* buffer for soniox transcripts */
+    this._sonioxTranscripts = [];
+
+    recognizer.hints = recognizer.hints || [];
+    recognizer.altLanguages = recognizer.altLanguages || [];
  }

  get name() { return TaskName.Transcribe; }
@@ -43,6 +56,7 @@ class TaskTranscribe extends SttTask {
  async exec(cs, {ep, ep2}) {
    super.exec(cs);
    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
+    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;

    if (cs.hasGlobalSttHints) {
      const {hints, hintsBoost} = cs.globalSttHints;
@@ -70,40 +84,38 @@ class TaskTranscribe extends SttTask {
      this.language = cs.speechRecognizerLanguage;
      if (this.data.recognizer) this.data.recognizer.language = this.language;
    }
-    if ('default' === this.label || !this.label) {
-      this.label = cs.speechRecognizerLabel;
-      if (this.data.recognizer) this.data.recognizer.label = this.label;
-    }
-    // Fallback options
-    if ('default' === this.fallbackVendor || !this.fallbackVendor) {
-      this.fallbackVendor = cs.fallbackSpeechRecognizerVendor;
-      if (this.data.recognizer) this.data.recognizer.fallbackVendor = this.fallbackVendor;
-    }
-    if ('default' === this.fallbackLanguage || !this.fallbackLanguage) {
-      this.fallbackLanguage = cs.fallbackSpeechRecognizerLanguage;
-      if (this.data.recognizer) this.data.recognizer.fallbackLanguage = this.fallbackLanguage;
-    }
-    if ('default' === this.fallbackLabel || !this.fallbackLabel) {
-      this.fallbackLabel = cs.fallbackSpeechRecognizerLabel;
-      if (this.data.recognizer) this.data.recognizer.fallbackLabel = this.fallbackLabel;
-    }
    if (!this.data.recognizer.vendor) {
      this.data.recognizer.vendor = this.vendor;
    }
-
-    if (!this.sttCredentials) {
-      try {
-        this.sttCredentials = await this._initSpeechCredentials(cs, this.vendor, this.label);
-      } catch (error) {
-        if (this.fallbackVendor && this.isHandledByPrimaryProvider) {
-          await this._fallback();
-        } else {
-          throw error;
-        }
-      }
-    }
+    if (!this.sttCredentials) this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');

    try {
+      if (!this.sttCredentials) {
+        const {writeAlerts, AlertType} = cs.srf.locals;
+        this.logger.info(`TaskTranscribe:exec - ERROR stt using ${this.vendor} requested but creds not supplied`);
+        writeAlerts({
+          account_sid: cs.accountSid,
+          alert_type: AlertType.STT_NOT_PROVISIONED,
+          vendor: this.vendor
+        }).catch((err) => this.logger.info({err}, 'Error generating alert for no stt'));
+        throw new Error('no provisioned speech credentials for TTS');
+      }
+
+      if (this.vendor === 'nuance' && this.sttCredentials.client_id) {
+        /* get nuance access token */
+        const {client_id, secret} = this.sttCredentials;
+        const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
+        this.logger.debug({client_id},
+          `Transcribe:exec - got nuance access token ${servedFromCache ? 'from cache' : ''}`);
+        this.sttCredentials = {...this.sttCredentials, access_token};
+      }
+      else if (this.vendor == 'ibm' && this.sttCredentials.stt_api_key) {
+        /* get ibm access token */
+        const {stt_api_key, stt_region} = this.sttCredentials;
+        const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
+        this.logger.debug({stt_api_key}, `Gather:exec - got ibm access token ${servedFromCache ? 'from cache' : ''}`);
+        this.sttCredentials = {...this.sttCredentials, access_token, stt_region};
+      }
      await this._startTranscribing(cs, ep, 1);
      if (this.separateRecognitionPerChannel && ep2) {
        await this._startTranscribing(cs, ep2, 2);
@@ -120,7 +132,8 @@ class TaskTranscribe extends SttTask {
    this.removeSpeechListeners(ep);
  }

-  async _stopTranscription() {
+  async kill(cs) {
+    super.kill(cs);
    let stopTranscription = false;
    if (this.ep?.connected) {
      stopTranscription = true;
@@ -132,13 +145,6 @@ class TaskTranscribe extends SttTask {
      this.ep2.stopTranscription({vendor: this.vendor})
        .catch((err) => this.logger.info(err, 'Error TaskTranscribe:kill'));
    }
-
-    return stopTranscription;
-  }
-
-  async kill(cs) {
-    super.kill(cs);
-    const stopTranscription = this._stopTranscription();
    // hangup after 1 sec if we don't get a final transcription
    if (stopTranscription) this._timer = setTimeout(() => this.notifyTaskDone(), 1500);
    else this.notifyTaskDone();
@@ -146,23 +152,6 @@ class TaskTranscribe extends SttTask {
    await this.awaitTaskDone();
  }

-  async updateTranscribe(status) {
-    if (!this.killed && this.ep && this.ep.connected) {
-      this.logger.info(`TaskTranscribe:updateTranscribe status ${status}`);
-      switch (status) {
-        case TranscribeStatus.Pause:
-          await this._stopTranscription();
-          break;
-        case TranscribeStatus.Resume:
-          await this._startTranscribing(this.cs, this.ep, 1);
-          if (this.separateRecognitionPerChannel && this.ep2) {
-            await this._startTranscribing(this.cs, this.ep2, 2);
-          }
-          break;
-      }
-    }
-  }
-
  async _startTranscribing(cs, ep, channel) {
    const opts = this.setChannelVarsForStt(this, this.sttCredentials, this.data.recognizer);
    switch (this.vendor) {
@@ -238,19 +227,7 @@ class TaskTranscribe extends SttTask {
          this._onVadDetected.bind(this, cs, ep));
        break;
      default:
-        if (this.vendor.startsWith('custom:')) {
-          this.bugname = `${this.vendor}_transcribe`;
-          ep.addCustomEventListener(JambonzTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-          ep.addCustomEventListener(JambonzTranscriptionEvents.Connect, this._onJambonzConnect.bind(this, cs, ep));
-          ep.addCustomEventListener(JambonzTranscriptionEvents.ConnectFailure,
-            this._onJambonzConnectFailure.bind(this, cs, ep));
-          break;
-        }
-        else {
-          this.notifyError({ msg: 'ASR error', details:`Invalid vendor ${this.vendor}`});
-          this.notifyTaskDone();
-          throw new Error(`Invalid vendor ${this.vendor}`);
-        }
+        throw new Error(`Invalid vendor ${this.vendor}`);
    }

    /* common handler for all stt engine errors */
@@ -259,10 +236,6 @@ class TaskTranscribe extends SttTask {
      .catch((err) => this.logger.info(err, 'Error setting channel variables'));

    await this._transcribe(ep);
-
-    /* start child span for this channel */
-    const {span, ctx} = this.startChildSpan(`${STT_LISTEN_SPAN_NAME}:${channel}`);
-    this.childSpan[channel - 1] = {span, ctx};
  }

  async _transcribe(ep) {
@@ -312,36 +285,6 @@ class TaskTranscribe extends SttTask {
      }
    }

-    if (this.isContinuousAsr && evt.is_final) {
-      this._bufferedTranscripts.push(evt);
-      this._startAsrTimer(channel);
-    } else {
-      await this._resolve(channel, evt);
-    }
-  }
-
-  _compileTranscripts() {
-    assert(this._bufferedTranscripts.length);
-    const evt = this._bufferedTranscripts[0];
-    let t = '';
-    for (const a of this._bufferedTranscripts) {
-      t += ` ${a.alternatives[0].transcript}`;
-    }
-    evt.alternatives[0].transcript = t.trim();
-    return evt;
-  }
-
-  async _resolve(channel, evt) {
-    /* we've got a transcript, so end the otel child span for this channel */
-    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
-      this.childSpan[channel - 1].span.setAttributes({
-        channel,
-        'stt.resolve': 'transcript',
-        'stt.result': JSON.stringify(evt)
-      });
-      this.childSpan[channel - 1].span.end();
-    }
-
    if (this.transcriptionHook) {
      const b3 = this.getTracingPropagation();
      const httpHeaders = b3 && {b3};
@@ -372,44 +315,16 @@ class TaskTranscribe extends SttTask {
      this._clearTimer();
      this.notifyTaskDone();
    }
-    else {
-      /* start another child span for this channel */
-      const {span, ctx} = this.startChildSpan(`${STT_LISTEN_SPAN_NAME}:${channel}`);
-      this.childSpan[channel - 1] = {span, ctx};
-    }
  }

  _onNoAudio(cs, ep, channel) {
    this.logger.debug(`TaskTranscribe:_onNoAudio restarting transcription on channel ${channel}`);
-    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
-      this.childSpan[channel - 1].span.setAttributes({
-        channel,
-        'stt.resolve': 'timeout'
-      });
-      this.childSpan[channel - 1].span.end();
-    }
    this._transcribe(ep);
-
-    /* start new child span for this channel */
-    const {span, ctx} = this.startChildSpan(`${STT_LISTEN_SPAN_NAME}:${channel}`);
-    this.childSpan[channel - 1] = {span, ctx};
  }

  _onMaxDurationExceeded(cs, ep, channel) {
    this.logger.debug(`TaskTranscribe:_onMaxDurationExceeded restarting transcription on channel ${channel}`);
-    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
-      this.childSpan[channel - 1].span.setAttributes({
-        channel,
-        'stt.resolve': 'max duration exceeded'
-      });
-      this.childSpan[channel - 1].span.end();
-    }
-
    this._transcribe(ep);
-
-    /* start new child span for this channel */
-    const {span, ctx} = this.startChildSpan(`${STT_LISTEN_SPAN_NAME}:${channel}`);
-    this.childSpan[channel - 1] = {span, ctx};
  }

  _clearTimer() {
@@ -422,7 +337,7 @@ class TaskTranscribe extends SttTask {
    this.logger.debug('TaskTranscribe:_onDeepgramConnect');
  }

-  _onDeepGramConnectFailure(cs, _ep, channel, evt) {
+  _onDeepGramConnectFailure(cs, _ep, _channel, evt) {
    const {reason} = evt;
    const {writeAlerts, AlertType} = cs.srf.locals;
    this.logger.info({evt}, 'TaskTranscribe:_onDeepgramConnectFailure');
@@ -433,32 +348,6 @@ class TaskTranscribe extends SttTask {
      vendor: 'deepgram',
    }).catch((err) => this.logger.info({err}, 'Error generating alert for deepgram connection failure'));
    this.notifyError(`Failed connecting to speech vendor deepgram: ${reason}`);
-
-    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
-      this.childSpan[channel - 1].span.setAttributes({
-        channel,
-        'stt.resolve': 'connection failure'
-      });
-      this.childSpan[channel - 1].span.end();
-    }
-    this.notifyTaskDone();
-  }
-
-  _onJambonzConnect(_cs, _ep) {
-    this.logger.debug('TaskTranscribe:_onJambonzConnect');
-  }
-
-  _onJambonzConnectFailure(cs, _ep, evt) {
-    const {reason} = evt;
-    const {writeAlerts, AlertType} = cs.srf.locals;
-    this.logger.info({evt}, 'TaskTranscribe:_onJambonzConnectFailure');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      message: `Failed connecting to ${this.vendor} speech recognizer: ${reason}`,
-      vendor: this.vendor,
-    }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
-    this.notifyError({msg: 'ASR error', details:`Failed connecting to speech vendor ${this.vendor}: ${reason}`});
    this.notifyTaskDone();
  }

@@ -466,7 +355,7 @@ class TaskTranscribe extends SttTask {
    this.logger.debug('TaskTranscribe:_onIbmConnect');
  }

-  _onIbmConnectFailure(cs, _ep, channel, evt) {
+  _onIbmConnectFailure(cs, _ep, _channel, evt) {
    const {reason} = evt;
    const {writeAlerts, AlertType} = cs.srf.locals;
    this.logger.info({evt}, 'TaskTranscribe:_onIbmConnectFailure');
@@ -477,72 +366,31 @@ class TaskTranscribe extends SttTask {
      vendor: 'ibm',
    }).catch((err) => this.logger.info({err}, 'Error generating alert for IBM connection failure'));
    this.notifyError(`Failed connecting to speech vendor IBM: ${reason}`);
-
-    if (this.childSpan[channel - 1] && this.childSpan[channel - 1].span) {
-      this.childSpan[channel - 1].span.setAttributes({
-        channel,
-        'stt.resolve': 'connection failure'
-      });
-      this.childSpan[channel - 1].span.end();
-    }
    this.notifyTaskDone();
  }
  _onIbmError(cs, _ep, _channel, evt) {
    this.logger.info({evt}, 'TaskTranscribe:_onIbmError');
  }
-  async _onJambonzError(cs, _ep, evt) {
+  _onJambonzError(cs, _ep, evt) {
    this.logger.info({evt}, 'TaskTranscribe:_onJambonzError');
-    if (this.isHandledByPrimaryProvider && this.fallbackVendor) {
-      _ep.stopTranscription({vendor: this.vendor})
-        .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 {
-        await this._fallback();
-        let channel = 1;
-        if (this.ep !== _ep) {
-          channel = 2;
-        }
-        this._startTranscribing(cs, _ep, channel);
-        updateSpeechCredentialLastUsed(this.sttCredentials.speech_credential_sid);
-        return;
-      } catch (error) {
-        this.logger.info({error}, `There is error while falling back to ${this.fallbackVendor}`);
-      }
-    } else {
-      const {writeAlerts, AlertType} = cs.srf.locals;
+    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'));
-      this.notifyError({msg: 'ASR error', details:`Custom speech vendor ${this.vendor} error: ${evt.error}`});
+    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'));
+    this.notifyError({msg: 'ASR error', details:`Custom speech vendor ${this.vendor} error: ${evt.error}`});
  }

-  _startAsrTimer(channel) {
-    assert(this.isContinuousAsr);
-    this._clearAsrTimer(channel);
-    this._asrTimer = setTimeout(() => {
-      this.logger.debug(`TaskTranscribe:_startAsrTimer - asr timer went off for channel: ${channel}`);
-      const evt = this._compileTranscripts();
-      this._bufferedTranscripts = [];
-      this._resolve(channel, evt);
-    }, this.asrTimeout);
-    this.logger.debug(`TaskTranscribe:_startAsrTimer: set for ${this.asrTimeout}ms for channel ${channel}`);
-  }

-  _clearAsrTimer(channel) {
-    if (this._asrTimer) clearTimeout(this._asrTimer);
-    this._asrTimer = null;
-  }
 }

 module.exports = TaskTranscribe;
--- a/lib/utils/amd-utils.js
+++ b/lib/utils/amd-utils.js
@@ -1,21 +1,14 @@
 const Emitter = require('events');
 const {readFile} = require('fs');
 const {
-  TaskName,
  GoogleTranscriptionEvents,
  AwsTranscriptionEvents,
  AzureTranscriptionEvents,
-  NuanceTranscriptionEvents,
-  NvidiaTranscriptionEvents,
-  IbmTranscriptionEvents,
-  SonioxTranscriptionEvents,
-  DeepgramTranscriptionEvents,
-  JambonzTranscriptionEvents,
  AmdEvents,
  AvmdEvents
 } = require('./constants');
 const bugname = 'amd_bug';
-const {VMD_HINTS_FILE} = require('../config');
+const {VMD_HINTS_FILE} = process.env;
 let voicemailHints = [];

 const updateHints = async(file, callback) => {
@@ -54,19 +47,13 @@ class Amd extends Emitter {
    this.language = opts.recognizer?.language || cs.speechRecognizerLanguage;
    if ('default' === this.language) this.language = cs.speechRecognizerLanguage;

-    this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt',
-      opts.recognizer?.label || cs.speechRecognizerLabel);
+    this.sttCredentials = cs.getSpeechCredentials(this.vendor, 'stt');

    if (!this.sttCredentials) throw new Error(`No speech credentials found for vendor ${this.vendor}`);

    this.thresholdWordCount = opts.thresholdWordCount || 9;
    const {normalizeTranscription} = require('./transcription-utils')(logger);
    this.normalizeTranscription = normalizeTranscription;
-    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;
-    this.getNuanceAccessToken = getNuanceAccessToken;
-    this.getIbmAccessToken = getIbmAccessToken;
-    const {setChannelVarsForStt} = require('./transcription-utils')(logger);
-    this.setChannelVarsForStt = setChannelVarsForStt;

    const {
      noSpeechTimeoutMs = 5000,
@@ -197,7 +184,7 @@ module.exports = (logger) => {
    const {vendor, language} = ep.amd;
    ep.startTranscription({
      vendor,
-      locale: language,
+      language,
      interim: true,
      bugname
    }).catch((err) => {
@@ -242,92 +229,51 @@ module.exports = (logger) => {

  const startAmd = async(cs, ep, task, opts) => {
    const amd = ep.amd = new Amd(logger, cs, opts);
-    const {vendor, language} = amd;
-    let sttCredentials = amd.sttCredentials;
+    const {vendor, language, sttCredentials} = amd;
+    const sttOpts = {};
    const hints = voicemailHints[language] || [];

-    if (vendor === 'nuance' && sttCredentials.client_id) {
-      /* get nuance access token */
-      const {getNuanceAccessToken} = amd;
-      const {client_id, secret} = sttCredentials;
-      const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
-      logger.debug({client_id}, `Gather:exec - got nuance access token ${servedFromCache ? 'from cache' : ''}`);
-      sttCredentials = {...sttCredentials, access_token};
-    }
-    else if (vendor == 'ibm' && sttCredentials.stt_api_key) {
-      /* get ibm access token */
-      const {getIbmAccessToken} = amd;
-      const {stt_api_key, stt_region} = sttCredentials;
-      const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
-      logger.debug({stt_api_key}, `Gather:exec - got ibm access token ${servedFromCache ? 'from cache' : ''}`);
-      sttCredentials = {...sttCredentials, access_token, stt_region};
-    }
-
    /* set stt options */
    logger.info(`starting amd for vendor ${vendor} and language ${language}`);
-    const sttOpts = amd.setChannelVarsForStt({name: TaskName.Gather}, sttCredentials, {
-      vendor,
-      hints,
-      enhancedModel: true,
-      altLanguages: opts.recognizer?.altLanguages || [],
-      initialSpeechTimeoutMs: opts.resolveTimeoutMs,
-    });
+    if ('google' === vendor) {
+      sttOpts.GOOGLE_APPLICATION_CREDENTIALS = JSON.stringify(sttCredentials.credentials);
+      sttOpts.GOOGLE_SPEECH_USE_ENHANCED = true;
+      sttOpts.GOOGLE_SPEECH_HINTS = hints.join(',');
+      if (opts.recognizer?.altLanguages) {
+        sttOpts.GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = opts.recognizer.altLanguages.join(',');
+      }
+      ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
+      ep.addCustomEventListener(GoogleTranscriptionEvents.EndOfUtterance, onEndOfUtterance.bind(null, cs, ep, task));
+    }
+    else if (['aws', 'polly'].includes(vendor)) {
+      Object.assign(sttOpts, {
+        AWS_ACCESS_KEY_ID: sttCredentials.accessKeyId,
+        AWS_SECRET_ACCESS_KEY: sttCredentials.secretAccessKey,
+        AWS_REGION: sttCredentials.region
+      });
+      ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
+    }
+    else if ('microsoft' === vendor) {
+      Object.assign(sttOpts, {
+        'AZURE_SUBSCRIPTION_KEY': sttCredentials.api_key,
+        'AZURE_REGION': sttCredentials.region
+      });
+      sttOpts.AZURE_SPEECH_HINTS = hints.join(',');
+      if (opts.recognizer?.altLanguages) {
+        sttOpts.AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = opts.recognizer.altLanguages.join(',');
+      }
+      sttOpts.AZURE_INITIAL_SPEECH_TIMEOUT_MS = opts.resolveTimeoutMs || 20000;

+      ep.addCustomEventListener(AzureTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
+      ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected, onNoSpeechDetected.bind(null, cs, ep, task));
+    }
    await ep.set(sttOpts).catch((err) => logger.info(err, 'Error setting channel variables'));

-    amd.transcriptionHandler = onTranscription.bind(null, cs, ep, task);
-    amd.EndOfUtteranceHandler = onEndOfUtterance.bind(null, cs, ep, task);
-    amd.noSpeechHandler = onNoSpeechDetected.bind(null, cs, ep, task);
-
-    switch (vendor) {
-      case 'google':
-        ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        ep.addCustomEventListener(GoogleTranscriptionEvents.EndOfUtterance, amd.EndOfUtteranceHandler);
-        break;
-
-      case 'aws':
-      case 'polly':
-        ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-      case 'microsoft':
-        ep.addCustomEventListener(AzureTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected, amd.noSpeechHandler);
-        break;
-      case 'nuance':
-        ep.addCustomEventListener(NuanceTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-
-      case 'deepgram':
-        ep.addCustomEventListener(DeepgramTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-
-      case 'soniox':
-        amd.bugname = 'soniox_amd_transcribe';
-        ep.addCustomEventListener(SonioxTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-
-      case 'ibm':
-        ep.addCustomEventListener(IbmTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-
-      case 'nvidia':
-        ep.addCustomEventListener(NvidiaTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-
-      default:
-        if (vendor.startsWith('custom:')) {
-          ep.addCustomEventListener(JambonzTranscriptionEvents.Transcription, amd.transcriptionHandler);
-          break;
-        }
-        else {
-          throw new Error(`Invalid vendor ${this.vendor}`);
-        }
-    }
    amd
      .on(AmdEvents.NoSpeechDetected, (evt) => {
        task.emit('amd', {type: AmdEvents.NoSpeechDetected, ...evt});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -335,7 +281,7 @@ module.exports = (logger) => {
      .on(AmdEvents.HumanDetected, (evt) => {
        task.emit('amd', {type: AmdEvents.HumanDetected, ...evt});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -346,7 +292,7 @@ module.exports = (logger) => {
      .on(AmdEvents.DecisionTimeout, (evt) => {
        task.emit('amd', {type: AmdEvents.DecisionTimeout, ...evt});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -354,7 +300,7 @@ module.exports = (logger) => {
      .on(AmdEvents.ToneTimeout, (evt) => {
        //task.emit('amd', {type: AmdEvents.ToneTimeout, ...evt});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.execute('avmd_stop').catch((err) => logger.info(err, 'Error stopping avmd'));
        } catch (err) {
          logger.info({err}, 'Error stopping avmd');
        }
@@ -362,7 +308,7 @@ module.exports = (logger) => {
      .on(AmdEvents.MachineStoppedSpeaking, () => {
        task.emit('amd', {type: AmdEvents.MachineStoppedSpeaking});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -381,19 +327,6 @@ module.exports = (logger) => {
    if (ep.amd) {
      vendor = ep.amd.vendor;
      ep.amd.stopAllTimers();
-
-      ep.removeListener(GoogleTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(GoogleTranscriptionEvents.EndOfUtterance, ep.amd.EndOfUtteranceHandler);
-      ep.removeListener(AwsTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(AzureTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(AzureTranscriptionEvents.NoSpeechDetected, ep.amd.noSpeechHandler);
-      ep.removeListener(NuanceTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(DeepgramTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(SonioxTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(IbmTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(NvidiaTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(JambonzTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-
      ep.amd = null;
    }

--- a/lib/utils/aws-sns-lifecycle.js
+++ b/lib/utils/aws-sns-lifecycle.js
@@ -1,30 +1,20 @@
 const Emitter = require('events');
 const bent = require('bent');
 const assert = require('assert');
-const {
-  AWS_REGION,
-  AWS_SNS_PORT: PORT,
-  AWS_SNS_TOPIC_ARM,
-  AWS_SNS_PORT_MAX,
-} = require('../config');
+const PORT = process.env.AWS_SNS_PORT || 3010;
 const {LifeCycleEvents} = require('./constants');
 const express = require('express');
 const app = express();
 const getString = bent('string');
-const {
-  SNSClient,
-  SubscribeCommand,
-  UnsubscribeCommand } = require('@aws-sdk/client-sns');
-const snsClient = new SNSClient({ region: AWS_REGION, apiVersion: '2010-03-31' });
-const {
-  AutoScalingClient,
-  DescribeAutoScalingGroupsCommand,
-  CompleteLifecycleActionCommand } = require('@aws-sdk/client-auto-scaling');
-const autoScalingClient = new AutoScalingClient({ region: AWS_REGION, apiVersion: '2011-01-01' });
+const AWS = require('aws-sdk');
+const sns = new AWS.SNS({apiVersion: '2010-03-31'});
+const autoscaling = new AWS.AutoScaling({apiVersion: '2011-01-01'});
 const {Parser} = require('xml2js');
 const parser = new Parser();
 const {validatePayload} = require('verify-aws-sns-signature');

+AWS.config.update({region: process.env.AWS_REGION});
+
 class SnsNotifier extends Emitter {
  constructor(logger) {
    super();
@@ -41,8 +31,8 @@ class SnsNotifier extends Emitter {

  _handleErrors(logger, app, resolve, reject, e) {
    if (e.code === 'EADDRINUSE' &&
-      AWS_SNS_PORT_MAX &&
-      e.port < AWS_SNS_PORT_MAX) {
+      process.env.AWS_SNS_PORT_MAX &&
+      e.port < process.env.AWS_SNS_PORT_MAX) {

      logger.info(`SNS lifecycle server failed to bind port on ${e.port}, will try next port`);
      const server = this._doListen(logger, app, ++e.port, resolve);
@@ -74,7 +64,7 @@ class SnsNotifier extends Emitter {
            subscriptionRequestId: this.subscriptionRequestId
          }, 'response from SNS SubscribeURL');
          const data = await this.describeInstance();
-          this.lifecycleState = data.AutoScalingGroups[0].Instances[0].LifecycleState;
+          this.lifecycleState = data.AutoScalingInstances[0].LifecycleState;
          this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
          break;

@@ -140,56 +130,51 @@ class SnsNotifier extends Emitter {

  async subscribe() {
    try {
-      const params = {
+      const response = await sns.subscribe({
        Protocol: 'http',
-        TopicArn: AWS_SNS_TOPIC_ARM,
+        TopicArn: process.env.AWS_SNS_TOPIC_ARM,
        Endpoint: this.snsEndpoint
-      };
-      const response = await snsClient.send(new SubscribeCommand(params));
-      this.logger.info({response}, `response to SNS subscribe to ${AWS_SNS_TOPIC_ARM}`);
+      }).promise();
+      this.logger.info({response}, `response to SNS subscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
    } catch (err) {
-      this.logger.error({err}, `Error subscribing to SNS topic arn ${AWS_SNS_TOPIC_ARM}`);
+      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
    }
  }

  async unsubscribe() {
    if (!this.subscriptionArn) throw new Error('SnsNotifier#unsubscribe called without an active subscription');
    try {
-      const params = {
+      const response = await sns.unsubscribe({
        SubscriptionArn: this.subscriptionArn
-      };
-      const response = await snsClient.send(new UnsubscribeCommand(params));
-      this.logger.info({response}, `response to SNS unsubscribe to ${AWS_SNS_TOPIC_ARM}`);
+      }).promise();
+      this.logger.info({response}, `response to SNS unsubscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
    } catch (err) {
-      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${AWS_SNS_TOPIC_ARM}`);
+      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
    }
  }

  completeScaleIn() {
    assert(this.scaleInParams);
-    autoScalingClient.send(new CompleteLifecycleActionCommand(this.scaleInParams))
-      .then((data) => {
-        return this.logger.info({data}, 'Successfully completed scale-in action');
-      })
-      .catch((err) => {
-        this.logger.error({err}, 'Error completing scale-in');
-      });
+    autoscaling.completeLifecycleAction(this.scaleInParams, (err, response) => {
+      if (err) return this.logger.error({err}, 'Error completing scale-in');
+      this.logger.info({response}, 'Successfully completed scale-in action');
+    });
  }

  describeInstance() {
    return new Promise((resolve, reject) => {
      if (!this.instanceId) return reject('instance-id unknown');
-      autoScalingClient.send(new DescribeAutoScalingGroupsCommand({
+      autoscaling.describeAutoScalingInstances({
        InstanceIds: [this.instanceId]
-      }))
-        .then((data) => {
-          this.logger.info({data}, 'SnsNotifier: describeInstance');
-          return resolve(data);
-        })
-        .catch((err) => {
+      }, (err, data) => {
+        if (err) {
          this.logger.error({err}, 'Error describing instances');
          reject(err);
-        });
+        } else {
+          this.logger.info({data}, 'SnsNotifier: describeInstance');
+          resolve(data);
+        }
+      });
    });
  }

@@ -203,7 +188,7 @@ module.exports = async function(logger) {
  process.on('SIGHUP', async() => {
    try {
      const data = await notifier.describeInstance();
-      const state = data.AutoScalingGroups[0].Instances[0].LifecycleState;
+      const state = data.AutoScalingInstances[0].LifecycleState;
      if (state !== notifier.lifecycleState) {
        notifier.lifecycleState = state;
        switch (state) {
--- a/lib/utils/base-requestor.js
+++ b/lib/utils/base-requestor.js
@@ -2,7 +2,6 @@ const assert = require('assert');
 const Emitter = require('events');
 const crypto = require('crypto');
 const timeSeries = require('@jambonz/time-series');
-const {NODE_ENV, JAMBONES_TIME_SERIES_HOST} = require('../config');
 let alerter ;

 class BaseRequestor extends Emitter {
@@ -23,9 +22,9 @@ class BaseRequestor extends Emitter {

    if (!alerter) {
      alerter = timeSeries(logger, {
-        host: JAMBONES_TIME_SERIES_HOST,
+        host: process.env.JAMBONES_TIME_SERIES_HOST,
        commitSize: 50,
-        commitInterval: 'test' === NODE_ENV ? 7 : 20
+        commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
      });
    }
  }
--- a/lib/utils/call-tracer.js
+++ b/lib/utils/call-tracer.js
@@ -2,24 +2,17 @@ const {context, trace} = require('@opentelemetry/api');
 const {Dialog} = require('drachtio-srf');
 class RootSpan {
  constructor(callType, req) {
-    const {srf} = require('../../');
-    const tracer = srf.locals.otel.tracer;
-    let callSid, accountSid, applicationSid, linkedSpanId;
+    let tracer, callSid, linkedSpanId;

    if (req instanceof Dialog) {
      const dlg = req;
+      tracer = dlg.srf.locals.otel.tracer;
      callSid = dlg.callSid;
      linkedSpanId = dlg.linkedSpanId;
    }
-    else if (req.srf) {
-      callSid = req.locals.callSid;
-      accountSid = req.get('X-Account-Sid'),
-      applicationSid = req.locals.application_sid;
-    }
    else {
-      callSid = req.callSid;
-      accountSid = req.accountSid;
-      applicationSid = req.applicationSid;
+      tracer = req.srf.locals.otel.tracer;
+      callSid = req.locals.callSid;
    }
    this._span = tracer.startSpan(callType || 'incoming-call');
    if (req instanceof Dialog) {
@@ -29,20 +22,13 @@ class RootSpan {
        callId: dlg.sip.callId
      });
    }
-    else if (req.srf) {
-      this._span.setAttributes({
-        callSid,
-        accountSid,
-        applicationSid,
-        callId: req.get('Call-ID'),
-        externalCallId: req.get('X-CID')
-      });
-    }
    else {
      this._span.setAttributes({
        callSid,
-        accountSid,
-        applicationSid
+        accountSid: req.get('X-Account-Sid'),
+        applicationSid: req.locals.application_sid,
+        callId: req.get('Call-ID'),
+        externalCallId: req.get('X-CID')
      });
    }

--- a/lib/utils/constants.json
+++ b/lib/utils/constants.json
@@ -51,11 +51,6 @@
    "Silence": "silence",
    "Resume": "resume"
  },
-  "TranscribeStatus": {
-    "Pause": "pause",
-    "Silence": "silence",
-    "Resume": "resume"
-  },
  "TaskPreconditions": {
    "None": "none",
    "Endpoint": "endpoint",
--- a/lib/utils/cron-jobs.js
+++ b/lib/utils/cron-jobs.js
@@ -1,24 +1,19 @@
 const {execSync} = require('child_process');
-const {
-  JAMBONES_FREESWITCH,
-  NODE_ENV,
-  JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS,
-} = require('../config');
 const now = Date.now();
-const fsInventory = JAMBONES_FREESWITCH
+const fsInventory = process.env.JAMBONES_FREESWITCH
  .split(',')
  .map((fs) => {
    const arr = /^([^:]*):([^:]*):([^:]*)(?::([^:]*))?/.exec(fs);
    const opts = {address: arr[1], port: arr[2], secret: arr[3]};
    if (arr.length > 4) opts.advertisedAddress = arr[4];
-    if (NODE_ENV === 'test') opts.listenAddress = '0.0.0.0';
+    if (process.env.NODE_ENV === 'test') opts.listenAddress = '0.0.0.0';
    return opts;
  });

 const clearChannels = () => {
  const {logger} = require('../..');
  const pwd = fsInventory[0].secret;
-  const maxDurationMins = JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS;
+  const maxDurationMins = process.env.JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS || 180;

  const calls = execSync(`/usr/local/freeswitch/bin/fs_cli -p ${pwd} -x "show calls"`, {encoding: 'utf8'})
    .split('\n')
--- a/lib/utils/db-utils.js
+++ b/lib/utils/db-utils.js
@@ -3,10 +3,13 @@ const {decrypt} = require('./encrypt-decrypt');
 const sqlAccountDetails = `SELECT * 
 FROM accounts account 
 WHERE account.account_sid = ?`;
-const sqlSpeechCredentialsForAccount = `SELECT * 
+const sqlSpeechCredentials = `SELECT * 
 FROM speech_credentials 
-WHERE account_sid = ? OR (account_sid is NULL AND service_provider_sid =  
-(SELECT service_provider_sid from accounts where account_sid = ?))`;
+WHERE account_sid = ? `;
+const sqlSpeechCredentialsForSP = `SELECT * 
+FROM speech_credentials 
+WHERE service_provider_sid =  
+(SELECT service_provider_sid from accounts where account_sid = ?)`;
 const sqlQueryAccountCarrierByName = `SELECT voip_carrier_sid  
 FROM voip_carriers vc 
 WHERE vc.account_sid = ? 
@@ -17,16 +20,6 @@ WHERE vc.account_sid IS NULL
 AND vc.service_provider_sid = 
 (SELECT service_provider_sid from accounts where account_sid = ?) 
 AND vc.name = ?`;
-const sqlQueryAccountPhoneNumber = `SELECT voip_carrier_sid 
-FROM phone_numbers pn
-WHERE pn.account_sid = ?
-AND pn.number = ?`;
-const sqlQuerySPPhoneNumber = `SELECT voip_carrier_sid  
-FROM phone_numbers pn 
-WHERE pn.account_sid IS NULL 
-AND pn.service_provider_sid = 
-(SELECT service_provider_sid from accounts where account_sid = ?) 
-AND pn.number = ?`;

 const speechMapper = (cred) => {
  const {credential, ...obj} = cred;
@@ -46,10 +39,8 @@ const speechMapper = (cred) => {
      obj.region = o.region;
      obj.use_custom_stt = o.use_custom_stt;
      obj.custom_stt_endpoint = o.custom_stt_endpoint;
-      obj.custom_stt_endpoint_url = o.custom_stt_endpoint_url;
      obj.use_custom_tts = o.use_custom_tts;
      obj.custom_tts_endpoint = o.custom_tts_endpoint;
-      obj.custom_tts_endpoint_url = o.custom_tts_endpoint_url;
    }
    else if ('wellsaid' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
@@ -77,10 +68,6 @@ const speechMapper = (cred) => {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
    }
-    else if ('nvidia' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.riva_server_uri = o.riva_server_uri;
-    }
    else if (obj.vendor.startsWith('custom:')) {
      const o = JSON.parse(decrypt(credential));
      obj.auth_token = o.auth_token;
@@ -93,28 +80,27 @@ const speechMapper = (cred) => {
  return obj;
 };

-const bucketCredentialDecrypt = (account) => {
-  const { bucket_credential } = account.account;
-  if (!bucket_credential || bucket_credential.vendor) return;
-  account.account.bucket_credential = JSON.parse(decrypt(bucket_credential));
-};
-
 module.exports = (logger, srf) => {
  const {pool}  = srf.locals.dbHelpers;
  const pp = pool.promise();

  const lookupAccountDetails = async(account_sid) => {

-    const [r] = await pp.query({sql: sqlAccountDetails, nestTables: true}, [account_sid]);
+    const [r] = await pp.query({sql: sqlAccountDetails, nestTables: true}, account_sid);
    if (0 === r.length) throw new Error(`invalid accountSid: ${account_sid}`);
-    const [r2] = await pp.query(sqlSpeechCredentialsForAccount, [account_sid, account_sid]);
+    const [r2] = await pp.query(sqlSpeechCredentials, account_sid);
    const speech = r2.map(speechMapper);

-    const account = r[0];
-    bucketCredentialDecrypt(account);
+    /* add service provider creds unless we have that vendor at the account level */
+    const [r3] = await pp.query(sqlSpeechCredentialsForSP, account_sid);
+    r3.forEach((s) => {
+      if (!speech.find((s2) => s2.vendor === s.vendor)) {
+        speech.push(speechMapper(s));
+      }
+    });

    return {
-      ...account,
+      ...r[0],
      speech
    };
  };
@@ -142,22 +128,9 @@ module.exports = (logger, srf) => {
    }
  };

-  const lookupCarrierByPhoneNumber = async(account_sid, phoneNumber) => {
-    const pp = pool.promise();
-    try {
-      const [r] = await pp.query(sqlQueryAccountPhoneNumber, [account_sid, phoneNumber]);
-      if (r.length) return r[0].voip_carrier_sid;
-      const [r2] = await pp.query(sqlQuerySPPhoneNumber, [account_sid, phoneNumber]);
-      if (r2.length) return r2[0].voip_carrier_sid;
-    } catch (err) {
-      logger.error({err}, `lookupPhoneNumber: Error ${account_sid}:${phoneNumber}`);
-    }
-  };
-
  return {
    lookupAccountDetails,
    updateSpeechCredentialLastUsed,
-    lookupCarrier,
-    lookupCarrierByPhoneNumber
+    lookupCarrier
  };
 };
--- a/lib/utils/encrypt-decrypt.js
+++ b/lib/utils/encrypt-decrypt.js
@@ -1,9 +1,8 @@
 const crypto = require('crypto');
-const {LEGACY_CRYPTO, ENCRYPTION_SECRET, JWT_SECRET} = require('../config');
-const algorithm = LEGACY_CRYPTO ? 'aes-256-ctr' : 'aes-256-cbc';
+const algorithm = process.env.LEGACY_CRYPTO ? 'aes-256-ctr' : 'aes-256-cbc';
 const iv = crypto.randomBytes(16);
 const secretKey = crypto.createHash('sha256')
-  .update(ENCRYPTION_SECRET || JWT_SECRET)
+  .update(process.env.ENCRYPTION_SECRET || process.env.JWT_SECRET)
  .digest('base64')
  .substring(0, 32);

--- a/lib/utils/http-listener.js
+++ b/lib/utils/http-listener.js
@@ -1,21 +1,20 @@

 const express = require('express');
 const httpRoutes = require('../http-routes');
-const {PORT, HTTP_PORT_MAX} = require('../config');
+const PORT = process.env.HTTP_PORT || 3000;

 const doListen = (logger, app, port, resolve) => {
  const server = app.listen(port, () => {
    const {srf} = app.locals;
-    srf.locals.serviceUrl = `http://${srf.locals.ipv4}:${port}`;
-    logger.info(`listening for HTTP requests on port ${port}, serviceUrl is ${srf.locals.serviceUrl}`);
+    logger.info(`listening for HTTP requests on port ${PORT}, serviceUrl is ${srf.locals.serviceUrl}`);
    resolve({server, app});
  });
  return server;
 };
 const handleErrors = (logger, app, resolve, reject, e) => {
  if (e.code === 'EADDRINUSE' &&
-    HTTP_PORT_MAX &&
-    e.port < HTTP_PORT_MAX) {
+    process.env.HTTP_PORT_MAX &&
+    e.port < process.env.HTTP_PORT_MAX) {

    logger.info(`HTTP server failed to bind port on ${e.port}, will try next port`);
    const server = doListen(logger, app, ++e.port, resolve);
--- a/lib/utils/http-requestor.js
+++ b/lib/utils/http-requestor.js
@@ -5,12 +5,7 @@ const BaseRequestor = require('./base-requestor');
 const {HookMsgTypes} = require('./constants.json');
 const snakeCaseKeys = require('./snakecase-keys');
 const pools = new Map();
-const {
-  HTTP_POOL,
-  HTTP_POOLSIZE,
-  HTTP_PIPELINING,
-  HTTP_TIMEOUT,
-} = require('../config');
+const HTTP_TIMEOUT = 10000;

 const toBase64 = (str) => Buffer.from(str || '', 'utf8').toString('base64');

@@ -39,15 +34,15 @@ class HttpRequestor extends BaseRequestor {
    this._resource = u.resource;
    this._port = u.port;
    this._search = u.search;
-    this._usePools = HTTP_POOL && parseInt(HTTP_POOL);
+    this._usePools = process.env.HTTP_POOL && parseInt(process.env.HTTP_POOL);

    if (this._usePools) {
      if (pools.has(this._baseUrl)) {
        this.client = pools.get(this._baseUrl);
      }
      else {
-        const connections = HTTP_POOLSIZE ? parseInt(HTTP_POOLSIZE) : 10;
-        const pipelining = HTTP_PIPELINING ? parseInt(HTTP_PIPELINING) : 1;
+        const connections = process.env.HTTP_POOLSIZE ? parseInt(process.env.HTTP_POOLSIZE) : 10;
+        const pipelining = process.env.HTTP_PIPELINING ? parseInt(process.env.HTTP_PIPELINING) : 1;
        const pool = this.client = new Pool(this._baseUrl, {
          connections,
          pipelining
--- a/lib/utils/install-srf-locals.js
+++ b/lib/utils/install-srf-locals.js
@@ -1,22 +1,6 @@
 const Mrf = require('drachtio-fsmrf');
 const ip = require('ip');
-const {
-  JAMBONES_MYSQL_HOST,
-  JAMBONES_MYSQL_USER,
-  JAMBONES_MYSQL_PASSWORD,
-  JAMBONES_MYSQL_DATABASE,
-  JAMBONES_MYSQL_CONNECTION_LIMIT,
-  JAMBONES_MYSQL_PORT,
-  JAMBONES_FREESWITCH,
-  JAMBONES_REDIS_HOST,
-  JAMBONES_REDIS_PORT,
-  JAMBONES_REDIS_SENTINELS,
-  SMPP_URL,
-  JAMBONES_TIME_SERIES_HOST,
-  JAMBONES_ESL_LISTEN_ADDRESS,
-  PORT,
-  NODE_ENV,
-} = require('../config');
+const PORT = process.env.HTTP_PORT || 3000;
 const assert = require('assert');

 function initMS(logger, wrapper, ms) {
@@ -58,18 +42,18 @@ function installSrfLocals(srf, logger) {
  let idxStart = 0;

  (async function() {
-    const fsInventory = JAMBONES_FREESWITCH
+    const fsInventory = process.env.JAMBONES_FREESWITCH
      .split(',')
      .map((fs) => {
        const arr = /^([^:]*):([^:]*):([^:]*)(?::([^:]*))?/.exec(fs);
-        assert.ok(arr, `Invalid syntax JAMBONES_FREESWITCH: ${JAMBONES_FREESWITCH}`);
+        assert.ok(arr, `Invalid syntax JAMBONES_FREESWITCH: ${process.env.JAMBONES_FREESWITCH}`);
        const opts = {address: arr[1], port: arr[2], secret: arr[3]};
        if (arr.length > 4) opts.advertisedAddress = arr[4];
        /* NB: originally for testing only, but for now all jambonz deployments
          have freeswitch installed locally alongside this app
        */
-        if (NODE_ENV === 'test') opts.listenAddress = '0.0.0.0';
-        else if (JAMBONES_ESL_LISTEN_ADDRESS) opts.listenAddress = JAMBONES_ESL_LISTEN_ADDRESS;
+        if (process.env.NODE_ENV === 'test') opts.listenAddress = '0.0.0.0';
+        else if (process.env.JAMBONES_ESL_LISTEN_ADDRESS) opts.listenAddress = process.env.JAMBONES_ESL_LISTEN_ADDRESS;
        return opts;
      });
    logger.info({fsInventory}, 'freeswitch inventory');
@@ -141,13 +125,13 @@ function installSrfLocals(srf, logger) {
    lookupAccountCapacitiesBySid,
    lookupSmppGateways
  } = require('@jambonz/db-helpers')({
-    host: JAMBONES_MYSQL_HOST,
-    user: JAMBONES_MYSQL_USER,
-    port: JAMBONES_MYSQL_PORT || 3306,
-    password: JAMBONES_MYSQL_PASSWORD,
-    database: JAMBONES_MYSQL_DATABASE,
-    connectionLimit: JAMBONES_MYSQL_CONNECTION_LIMIT || 10
-  }, logger);
+    host: process.env.JAMBONES_MYSQL_HOST,
+    user: process.env.JAMBONES_MYSQL_USER,
+    port: process.env.JAMBONES_MYSQL_PORT || 3306,
+    password: process.env.JAMBONES_MYSQL_PASSWORD,
+    database: process.env.JAMBONES_MYSQL_DATABASE,
+    connectionLimit: process.env.JAMBONES_MYSQL_CONNECTION_LIMIT || 10
+  }, logger, tracer);
  const {
    client,
    updateCallStatus,
@@ -168,30 +152,25 @@ function installSrfLocals(srf, logger) {
    removeFromList,
    getListPosition,
    lengthOfList,
-    addToSortedSet,
-    retrieveFromSortedSet,
-    retrieveByPatternSortedSet,
-    sortedSetLength,
-    sortedSetPositionByPattern
-  } = require('@jambonz/realtimedb-helpers')(JAMBONES_REDIS_SENTINELS || {
-    host: JAMBONES_REDIS_HOST,
-    port: JAMBONES_REDIS_PORT || 6379
+  } = require('@jambonz/realtimedb-helpers')({
+    host: process.env.JAMBONES_REDIS_HOST,
+    port: process.env.JAMBONES_REDIS_PORT || 6379
  }, logger, tracer);
  const {
    synthAudio,
    getNuanceAccessToken,
    getIbmAccessToken,
-  } = require('@jambonz/speech-utils')(JAMBONES_REDIS_SENTINELS || {
-    host: JAMBONES_REDIS_HOST,
-    port: JAMBONES_REDIS_PORT || 6379
+  } = require('@jambonz/speech-utils')({
+    host: process.env.JAMBONES_REDIS_HOST,
+    port: process.env.JAMBONES_REDIS_PORT || 6379
  }, logger, tracer);
  const {
    writeAlerts,
    AlertType
  } = require('@jambonz/time-series')(logger, {
-    host: JAMBONES_TIME_SERIES_HOST,
+    host: process.env.JAMBONES_TIME_SERIES_HOST,
    commitSize: 50,
-    commitInterval: 'test' === NODE_ENV ? 7 : 20
+    commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
  });

  let localIp;
@@ -234,17 +213,12 @@ function installSrfLocals(srf, logger) {
      lengthOfList,
      getListPosition,
      getNuanceAccessToken,
-      getIbmAccessToken,
-      addToSortedSet,
-      retrieveFromSortedSet,
-      retrieveByPatternSortedSet,
-      sortedSetLength,
-      sortedSetPositionByPattern
+      getIbmAccessToken
    },
    parentLogger: logger,
    getSBC,
    getSmpp: () => {
-      return SMPP_URL;
+      return process.env.SMPP_URL;
    },
    lifecycleEmitter,
    getFreeswitch,
--- a/lib/utils/place-outdial.js
+++ b/lib/utils/place-outdial.js
@@ -15,7 +15,7 @@ const RootSpan = require('./call-tracer');
 const uuidv4 = require('uuid-random');

 class SingleDialer extends Emitter {
-  constructor({logger, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan, dialTask}) {
+  constructor({logger, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan}) {
    super();
    assert(target.type);

@@ -37,7 +37,6 @@ class SingleDialer extends Emitter {
    this.callGone = false;

    this.callSid = uuidv4();
-    this.dialTask = dialTask;

    this.on('callStatusChange', this._notifyCallStatusChange.bind(this));
  }
@@ -46,10 +45,6 @@ class SingleDialer extends Emitter {
    return this.callInfo.callStatus;
  }

-  get applicationSid() {
-    return this.application?.application_sid || this.callInfo?.applicationSid;
-  }
-
  /**
   * can be used for all http requests within this session
   */
@@ -248,14 +243,9 @@ class SingleDialer extends Emitter {
        .on('modify', async(req, res) => {
          try {
            if (this.ep) {
-              if (this.dialTask && this.dialTask.isOnHold) {
-                this.logger.info('dial is onhold, emit event');
-                this.emit('reinvite', req, res);
-              } else {
-                const newSdp = await this.ep.modify(req.body);
-                res.send(200, {body: newSdp});
-                this.logger.info({offer: req.body, answer: newSdp}, 'SingleDialer:exec: handling reINVITE');
-              }
+              const newSdp = await this.ep.modify(req.body);
+              res.send(200, {body: newSdp});
+              this.logger.info({offer: req.body, answer: newSdp}, 'SingleDialer:exec: handling reINVITE');
            }
            else {
              this.logger.info('SingleDialer:exec: handling reINVITE with released media, emit event');
@@ -436,11 +426,11 @@ class SingleDialer extends Emitter {
 }

 function placeOutdial({
-  logger, srf, ms, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan, dialTask
+  logger, srf, ms, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan
 }) {
  const myOpts = deepcopy(opts);
  const sd = new SingleDialer({
-    logger, sbcAddress, target, myOpts, application, callInfo, accountInfo, rootSpan, startSpan, dialTask
+    logger, sbcAddress, target, myOpts, application, callInfo, accountInfo, rootSpan, startSpan
  });
  sd.exec(srf, ms, myOpts);
  return sd;
--- a/lib/utils/requestor.js
+++ b/lib/utils/requestor.js
@@ -1,9 +1,5 @@
 const assert = require('assert');
 const timeSeries = require('@jambonz/time-series');
-const {
-  NODE_ENV,
-  JAMBONES_TIME_SERIES_HOST
-} = require('../config');
 let alerter ;

 function isAbsoluteUrl(u) {
@@ -32,9 +28,9 @@ class Requestor {

    if (!alerter) {
      alerter = timeSeries(logger, {
-        host: JAMBONES_TIME_SERIES_HOST,
+        host: process.env.JAMBONES_TIME_SERIES_HOST,
        commitSize: 50,
-        commitInterval: 'test' === NODE_ENV ? 7 : 20
+        commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
      });
    }
  }
@@ -42,9 +38,9 @@ class Requestor {
  get Alerter() {
    if (!alerter) {
      alerter = timeSeries(this.logger, {
-        host: JAMBONES_TIME_SERIES_HOST,
+        host: process.env.JAMBONES_TIME_SERIES_HOST,
        commitSize: 50,
-        commitInterval: 'test' === NODE_ENV ? 7 : 20
+        commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
      });
    }
    return alerter;
--- a/lib/utils/sbc-pinger.js
+++ b/lib/utils/sbc-pinger.js
@@ -4,38 +4,28 @@ const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./constants');
 const Emitter = require('events');
 const debug = require('debug')('jambonz:feature-server');
 const noopLogger = {info: () => {}, error: () => {}};
-const {
-  JAMBONES_SBCS,
-  K8S,
-  K8S_SBC_SIP_SERVICE_NAME,
-  AWS_SNS_TOPIC_ARM,
-  OPTIONS_PING_INTERVAL,
-  AWS_REGION,
-  NODE_ENV,
-  JAMBONES_CLUSTER_ID,
-} = require('../config');

 module.exports = (logger) => {
  logger = logger || noopLogger;
  let idxSbc = 0;
  let sbcs = [];

-  if (JAMBONES_SBCS) {
-    sbcs = JAMBONES_SBCS
+  if (process.env.JAMBONES_SBCS) {
+    sbcs = process.env.JAMBONES_SBCS
      .split(',')
      .map((sbc) => sbc.trim());
    assert.ok(sbcs.length, 'JAMBONES_SBCS env var is empty or misconfigured');
    logger.info({sbcs}, 'SBC inventory');
  }
-  else if (K8S && K8S_SBC_SIP_SERVICE_NAME) {
-    sbcs = [`${K8S_SBC_SIP_SERVICE_NAME}:5060`];
+  else if (process.env.K8S && process.env.K8S_SBC_SIP_SERVICE_NAME) {
+    sbcs = [`${process.env.K8S_SBC_SIP_SERVICE_NAME}:5060`];
    logger.info({sbcs}, 'SBC inventory');
  }

  // listen for SNS lifecycle changes
  let lifecycleEmitter = new Emitter();
  let dryUpCalls = false;
-  if (AWS_SNS_TOPIC_ARM && AWS_REGION) {
+  if (process.env.AWS_SNS_TOPIC_ARM && process.env.AWS_REGION) {

    (async function() {
      try {
@@ -85,13 +75,13 @@ module.exports = (logger) => {
      }
    })();
  }
-  else if (K8S) {
+  else if (process.env.K8S) {
    lifecycleEmitter.scaleIn = () => process.exit(0);
  }


  async function pingProxies(srf) {
-    if (NODE_ENV === 'test') return;
+    if (process.env.NODE_ENV === 'test') return;

    for (const sbc of sbcs) {
      try {
@@ -101,8 +91,7 @@ module.exports = (logger) => {
          method: 'OPTIONS',
          headers: {
            'X-FS-Status': ms && !dryUpCalls ? 'open' : 'closed',
-            'X-FS-Calls': srf.locals.sessionTracker.count,
-            'X-FS-ServiceUrl': srf.locals.serviceUrl
+            'X-FS-Calls': srf.locals.sessionTracker.count
          }
        });
        req.on('response', (res) => {
@@ -113,7 +102,7 @@ module.exports = (logger) => {
      }
    }
  }
-  if (K8S) {
+  if (process.env.K8S) {
    setImmediate(() => {
      logger.info('disabling OPTIONS pings since we are running as a kubernetes service');
      const {srf} = require('../..');
@@ -134,16 +123,16 @@ module.exports = (logger) => {
    setInterval(() => {
      const {srf} = require('../..');
      pingProxies(srf);
-    }, OPTIONS_PING_INTERVAL);
+    }, process.env.OPTIONS_PING_INTERVAL || 30000);

    // initial ping once we are up
    setTimeout(async() => {

      // if SBCs are auto-scaling, monitor them as they come and go
      const {srf} = require('../..');
-      if (!JAMBONES_SBCS) {
+      if (!process.env.JAMBONES_SBCS) {
        const {monitorSet} = srf.locals.dbHelpers;
-        const setName = `${(JAMBONES_CLUSTER_ID || 'default')}:active-sip`;
+        const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-sip`;
        await monitorSet(setName, 10, (members) => {
          sbcs = members;
          logger.info(`sbc-pinger: SBC roster has changed, list of active SBCs is now ${sbcs}`);
--- a/lib/utils/sdp-utils.js
+++ b/lib/utils/sdp-utils.js
@@ -1,7 +0,0 @@
-const isOnhold = (sdp) => {
-  return sdp && (sdp.includes('a=sendonly') || sdp.includes('a=inactive'));
-};
-
-module.exports = {
-  isOnhold
-};
--- a/lib/utils/transcription-utils.js
+++ b/lib/utils/transcription-utils.js
@@ -225,17 +225,12 @@ const normalizeGoogle = (evt, channel, language) => {
  };
 };

-const normalizeCustom = (evt, channel, language, vendor) => {
-  const copy = JSON.parse(JSON.stringify(evt));
+const normalizeCustom = (evt, channel, language) => {
  return {
    language_code: language,
    channel_tag: channel,
    is_final: evt.is_final,
-    alternatives: [evt.alternatives[0]],
-    vendor: {
-      name: vendor,
-      evt: copy
-    }
+    alternatives: [evt.alternatives[0]]
  };
 };

@@ -319,7 +314,7 @@ module.exports = (logger) => {
        return normalizeSoniox(evt, channel, language);
      default:
        if (vendor.startsWith('custom:')) {
-          return normalizeCustom(evt, channel, language, vendor);
+          return normalizeCustom(evt, channel, language);
        }
        logger.error(`Unknown vendor ${vendor}`);
        return evt;
@@ -361,12 +356,12 @@ module.exports = (logger) => {
        ...(rOpts.punctuation === false && {GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: 0}),
        ...(rOpts.words  == false && {GOOGLE_SPEECH_ENABLE_WORD_TIME_OFFSETS: 0}),
        ...(rOpts.diarization === false && {GOOGLE_SPEECH_SPEAKER_DIARIZATION: 0}),
-        ...(rOpts.hints?.length > 0 && typeof rOpts.hints[0] === 'string' &&
+        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'string' &&
          {GOOGLE_SPEECH_HINTS: rOpts.hints.join(',')}),
-        ...(rOpts.hints?.length > 0 && typeof rOpts.hints[0] === 'object' &&
+        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'object' &&
          {GOOGLE_SPEECH_HINTS: JSON.stringify(rOpts.hints)}),
        ...(typeof rOpts.hintsBoost === 'number' && {GOOGLE_SPEECH_HINTS_BOOST: rOpts.hintsBoost}),
-        ...(rOpts.altLanguages?.length > 0 &&
+        ...(rOpts.altLanguages.length > 0 &&
          {GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES: [...new Set(rOpts.altLanguages)].join(',')}),
        ...(rOpts.interactionType &&
          {GOOGLE_SPEECH_METADATA_INTERACTION_TYPE: rOpts.interactionType}),
@@ -399,8 +394,6 @@ module.exports = (logger) => {
          {AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES: [...new Set(rOpts.altLanguages)].join(',')}),
        ...(rOpts.requestSnr && {AZURE_REQUEST_SNR: 1}),
        ...(rOpts.profanityOption && {AZURE_PROFANITY_OPTION: rOpts.profanityOption}),
-        ...(sttCredentials.use_custom_stt && sttCredentials.custom_stt_endpoint_url &&
-          {AZURE_SERVICE_ENDPOINT: sttCredentials.custom_stt_endpoint_url}),
        ...(rOpts.azureServiceEndpoint && {AZURE_SERVICE_ENDPOINT: rOpts.azureServiceEndpoint}),
        ...(rOpts.initialSpeechTimeoutMs > 0 &&
          {AZURE_INITIAL_SPEECH_TIMEOUT_MS: rOpts.initialSpeechTimeoutMs}),
@@ -408,11 +401,11 @@ module.exports = (logger) => {
        ...(rOpts.audioLogging && {AZURE_AUDIO_LOGGING: 1}),
        ...{AZURE_USE_OUTPUT_FORMAT_DETAILED: 1},
        ...(sttCredentials && {
-          ...(sttCredentials.api_key && {AZURE_SUBSCRIPTION_KEY: sttCredentials.api_key}),
-          ...(sttCredentials.region && {AZURE_REGION: sttCredentials.region}),
+          AZURE_SUBSCRIPTION_KEY: sttCredentials.api_key,
+          AZURE_REGION: sttCredentials.region,
        }),
        ...(sttCredentials.use_custom_stt && sttCredentials.custom_stt_endpoint &&
-          {AZURE_SERVICE_ENDPOINT_ID: sttCredentials.custom_stt_endpoint}),
+          {AZURE_SERVICE_ENDPOINT_ID: sttCredentials.custom_stt_endpoint})
      };
    }
    else if ('nuance' === vendor) {
@@ -556,7 +549,6 @@ module.exports = (logger) => {
    }
    else if ('nvidia' === vendor) {
      const {nvidiaOptions = {}} = rOpts;
-      const rivaUri = nvidiaOptions.rivaUri || sttCredentials.riva_server_uri;
      opts = {
        ...opts,
        ...((nvidiaOptions.profanityFilter || rOpts.profanityFilter) && {NVIDIA_PROFANITY_FILTER: 1}),
@@ -568,7 +560,7 @@ module.exports = (logger) => {
        ...(nvidiaOptions.maxAlternatives && {NVIDIA_MAX_ALTERNATIVES: nvidiaOptions.maxAlternatives}),
        ...(!nvidiaOptions.maxAlternatives && {NVIDIA_MAX_ALTERNATIVES: 1}),
        ...(rOpts.model && {NVIDIA_MODEL: rOpts.model}),
-        ...(rivaUri && {NVIDIA_RIVA_URI: rivaUri}),
+        ...(nvidiaOptions.rivaUri && {NVIDIA_RIVA_URI: nvidiaOptions.rivaUri}),
        ...(nvidiaOptions.verbatimTranscripts && {NVIDIA_VERBATIM_TRANSCRIPTS: 1}),
        ...(rOpts.diarization && {NVIDIA_SPEAKER_DIARIZATION: 1}),
        ...(rOpts.diarization && rOpts.diarizationMaxSpeakers > 0 &&
--- a/lib/utils/ws-requestor.js
+++ b/lib/utils/ws-requestor.js
@@ -4,13 +4,8 @@ const short = require('short-uuid');
 const {HookMsgTypes} = require('./constants.json');
 const Websocket = require('ws');
 const snakeCaseKeys = require('./snakecase-keys');
-const {
-  RESPONSE_TIMEOUT_MS,
-  JAMBONES_WS_PING_INTERVAL_MS,
-  MAX_RECONNECTS,
-  JAMBONES_WS_HANDSHAKE_TIMEOUT_MS,
-  JAMBONES_WS_MAX_PAYLOAD
-} = require('../config');
+const MAX_RECONNECTS = 5;
+const RESPONSE_TIMEOUT_MS = process.env.JAMBONES_WS_API_MSG_RESPONSE_TIMEOUT || 5000;

 class WsRequestor extends BaseRequestor {
  constructor(logger, account_sid, hook, secret) {
@@ -43,7 +38,6 @@ class WsRequestor extends BaseRequestor {
  async request(type, hook, params, httpHeaders = {}) {
    assert(HookMsgTypes.includes(type));
    const url = hook.url || hook;
-    const wantsAck = !['call:status', 'verb:status', 'jambonz:error'].includes(type);

    if (this.maliciousClient) {
      this.logger.info({url: this.url}, 'WsRequestor:request - discarding msg to malicious client');
@@ -74,19 +68,11 @@ class WsRequestor extends BaseRequestor {
      if (this.connectInProgress) {
        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});
-        }
+        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}`);
+      this.logger.debug(`WsRequestor:request(${this.id}) - connecting since we do not have a connection`);
      if (this.connections >= MAX_RECONNECTS) {
        return Promise.reject(`max attempts connecting to ${this.url}`);
      }
@@ -125,14 +111,9 @@ class WsRequestor extends BaseRequestor {

    const sendQueuedMsgs = () => {
      if (this.queuedMsg.length > 0) {
-        for (const {type, hook, params, httpHeaders, promise} of this.queuedMsg) {
+        for (const {type, hook, params, httpHeaders} of this.queuedMsg) {
          this.logger.debug(`WsRequestor:request - preparing queued ${type} for sending`);
-          if (promise) {
-            this.request(type, hook, params, httpHeaders)
-              .then((res) => promise.resolve(res))
-              .catch((err) => promise.reject(err));
-          }
-          else setImmediate(this.request.bind(this, type, hook, params, httpHeaders));
+          setImmediate(this.request.bind(this, type, hook, params, httpHeaders));
        }
        this.queuedMsg.length = 0;
      }
@@ -151,8 +132,8 @@ class WsRequestor extends BaseRequestor {
    }

    /* simple notifications */
-    if (!wantsAck || reconnectingWithoutAck) {
-      this.ws?.send(JSON.stringify(obj), () => {
+    if (['call:status', 'verb:status', 'jambonz:error'].includes(type) || reconnectingWithoutAck) {
+      this.ws.send(JSON.stringify(obj), () => {
        this.logger.debug({obj}, `WsRequestor:request websocket: sent (${url})`);
        sendQueuedMsgs();
      });
@@ -193,17 +174,9 @@ class WsRequestor extends BaseRequestor {
    });
  }

-  _stopPingTimer() {
-    if (this._pingTimer) {
-      clearInterval(this._pingTimer);
-      this._pingTimer = null;
-    }
-  }
-
  close() {
    this.closedGracefully = true;
    this.logger.debug('WsRequestor:close closing socket');
-    this._stopPingTimer();
    try {
      if (this.ws) {
        this.ws.close(1000);
@@ -218,16 +191,15 @@ class WsRequestor extends BaseRequestor {

  _connect() {
    assert(!this.ws);
-    this._stopPingTimer();
    return new Promise((resolve, reject) => {
-      const handshakeTimeout = JAMBONES_WS_HANDSHAKE_TIMEOUT_MS ?
-        parseInt(JAMBONES_WS_HANDSHAKE_TIMEOUT_MS) :
+      const handshakeTimeout = process.env.JAMBONES_WS_HANDSHAKE_TIMEOUT_MS ?
+        parseInt(process.env.JAMBONES_WS_HANDSHAKE_TIMEOUT_MS) :
        1500;
      let opts = {
        followRedirects: true,
        maxRedirects: 2,
        handshakeTimeout,
-        maxPayload: JAMBONES_WS_MAX_PAYLOAD ? parseInt(JAMBONES_WS_MAX_PAYLOAD) : 24 * 1024,
+        maxPayload: process.env.JAMBONES_WS_MAX_PAYLOAD ? parseInt(process.env.JAMBONES_WS_MAX_PAYLOAD) : 24 * 1024,
      };
      if (this.username && this.password) opts = {...opts, auth: `${this.username}:${this.password}`};

@@ -279,15 +251,10 @@ class WsRequestor extends BaseRequestor {
    this.connectInProgress = false;
    this.connections++;
    this.emit('ready', ws);
-
-    if (JAMBONES_WS_PING_INTERVAL_MS > 15000) {
-      this._pingTimer = setInterval(() => this.ws?.ping(), JAMBONES_WS_PING_INTERVAL_MS);
-    }
  }

  _onClose(code) {
    this.logger.info(`WsRequestor(${this.id}) - closed from far end ${code}`);
-    this._stopPingTimer();
    if (this.connections > 0 && code !== 1000) {
      this.logger.info({url: this.url}, 'WsRequestor - socket closed unexpectedly from remote side');
      this.emit('socket-closed');
@@ -312,7 +279,6 @@ class WsRequestor extends BaseRequestor {
  _onSocketClosed() {
    this.ws = null;
    this.emit('connection-dropped');
-    this._stopPingTimer();
    if (this.connections > 0 && this.connections < MAX_RECONNECTS && !this.closedGracefully) {
      if (!this._initMsgId) this._clearPendingMessages();
      this.logger.debug(`WsRequestor:_onSocketClosed waiting ${this.backoffMs} to reconnect`);
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "jambonz-feature-server",
-  "version": "0.8.4",
+  "version": "v0.8.2",
  "main": "app.js",
  "engines": {
    "node": ">= 10.16.0"
@@ -19,21 +19,18 @@
  "bugs": {},
  "scripts": {
    "start": "node app",
-    "test": "NODE_ENV=test JAMBONES_HOSTING=1 HTTP_POOL=1 JAMBONES_TTS_TRIM_SILENCE=1 ENCRYPTION_SECRET=foobar DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 DRACHTIO_SECRET=cymru JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=127.0.0.1 JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error ENABLE_METRICS=0 HTTP_PORT=3000 JAMBONES_SBCS=172.38.0.10 JAMBONES_FREESWITCH=127.0.0.1:8022:JambonzR0ck$:docker-host JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_NETWORK_CIDR=172.38.0.0/16 node test/ ",
+    "test": "NODE_ENV=test JAMBONES_HOSTING=1 HTTP_POOL=1 ENCRYPTION_SECRET=foobar DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 DRACHTIO_SECRET=cymru JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=127.0.0.1 JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error ENABLE_METRICS=0 HTTP_PORT=3000 JAMBONES_SBCS=172.38.0.10 JAMBONES_FREESWITCH=127.0.0.1:8022:JambonzR0ck$:docker-host JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_NETWORK_CIDR=172.38.0.0/16 node test/ ",
    "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
-    "jslint": "eslint app.js tracer.js lib",
-    "jslint:fix": "eslint app.js tracer.js lib --fix"
+    "jslint": "eslint app.js lib"
  },
  "dependencies": {
-    "@aws-sdk/client-auto-scaling": "^3.360.0",
-    "@aws-sdk/client-sns": "^3.360.0",
-    "@jambonz/db-helpers": "^0.9.1",
+    "@jambonz/db-helpers": "^0.7.4",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.8.6",
-    "@jambonz/speech-utils": "^0.0.20",
-    "@jambonz/stats-collector": "^0.1.9",
-    "@jambonz/time-series": "^0.2.8",
-    "@jambonz/verb-specifications": "^0.0.30",
+    "@jambonz/realtimedb-helpers": "^0.7.0",
+    "@jambonz/speech-utils": "^0.0.12",
+    "@jambonz/stats-collector": "^0.1.8",
+    "@jambonz/time-series": "^0.2.5",
+    "@jambonz/verb-specifications": "^0.0.11",
    "@opentelemetry/api": "^1.4.0",
    "@opentelemetry/exporter-jaeger": "^1.9.0",
    "@opentelemetry/exporter-trace-otlp-http": "^0.35.0",
@@ -43,11 +40,12 @@
    "@opentelemetry/sdk-trace-base": "^1.9.0",
    "@opentelemetry/sdk-trace-node": "^1.9.0",
    "@opentelemetry/semantic-conventions": "^1.9.0",
+    "aws-sdk": "^2.1313.0",
    "bent": "^7.3.12",
    "debug": "^4.3.4",
    "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^3.0.24",
-    "drachtio-srf": "^4.5.26",
+    "drachtio-fsmrf": "^3.0.20",
+    "drachtio-srf": "^4.5.23",
    "express": "^4.18.2",
    "ip": "^1.1.8",
    "moment": "^2.29.4",
@@ -63,7 +61,7 @@
    "uuid-random": "^1.3.2",
    "verify-aws-sns-signature": "^0.1.0",
    "ws": "^8.9.0",
-    "xml2js": "^0.6.2"
+    "xml2js": "^0.5.0"
  },
  "devDependencies": {
    "clear-module": "^4.1.2",
--- a/test/config-test.js
+++ b/test/config-test.js
@@ -39,7 +39,7 @@ test('\'config: listen\'', async(t) => {
      }
    ];

-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
@@ -86,7 +86,7 @@ test('\'config: listen - stop\'', async(t) => {
      }
    ];

-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
--- a/test/create-call-test.js
+++ b/test/create-call-test.js
@@ -37,7 +37,7 @@ test('test create-call timeout', async(t) => {
      'account_sid':account_sid,
      'timeout': 1,
      "call_hook": {
-        "url": "https://public-apps.jambonz.cloud/hello-world",
+        "url": "https://public-apps.jambonz.us/hello-world",
        "method": "POST"
      },
      "from": "15083718299",
@@ -88,11 +88,11 @@ test('test create-call call-hook basic authentication', async(t) => {

    let verbs = [
      {
-        "verb": "pause",
-        "length": 1
+        "verb": "say",
+        "text": "hello"
      }
    ];
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    //THEN
    await p;

@@ -106,117 +106,3 @@ test('test create-call call-hook basic authentication', async(t) => {
    t.error(err);
  }
 });
-
-test('test create-call amd', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-
-    // GIVEN
-    let from = 'create-call-amd';
-    let account_sid = 'bb845d4b-83a9-4cde-a6e9-50f3743bab3f';
-
-    // Give UAS app time to come up
-    const p = sippUac('uas.xml', '172.38.0.10', from);
-    await waitFor(1000);
-
-    const post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
-    post('v1/createCall', {
-      'account_sid':account_sid,
-      "call_hook": {
-        "url": "http://127.0.0.1:3100/",
-        "method": "POST",
-        "username": "username",
-        "password": "password"
-      },
-      "from": from,
-      "to": {
-        "type": "phone",
-        "number": "15583084809"
-      },
-      "amd": {
-        "actionHook": "/actionHook"
-      },
-      "speech_recognizer_vendor": "google",
-      "speech_recognizer_language": "en"
-    });
-
-    let verbs = [
-      {
-        "verb": "pause",
-        "length": 7
-      }
-    ];
-    await provisionCallHook(from, verbs);
-    //THEN
-    await p;
-
-    let obj = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`)
-    t.ok(obj.body.type = 'amd_no_speech_detected',
-      'create-call: AMD detected');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('test create-call app_json', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-
-    // GIVEN
-    let from = 'create-call-app-json';
-    let account_sid = 'bb845d4b-83a9-4cde-a6e9-50f3743bab3f';
-
-    // Give UAS app time to come up
-    const p = sippUac('uas.xml', '172.38.0.10', from);
-    await waitFor(1000);
-
-    const app_json = `[
-      {
-        "verb": "pause",
-        "length": 7
-      }
-    ]`;
-
-    const post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
-    post('v1/createCall', {
-      'account_sid':account_sid,
-      "call_hook": {
-        "url": "http://127.0.0.1:3100/",
-        "method": "POST",
-        "username": "username",
-        "password": "password"
-      },
-      app_json,
-      "from": from,
-      "to": {
-        "type": "phone",
-        "number": "15583084809"
-      },
-      "amd": {
-        "actionHook": "/actionHook"
-      },
-      "speech_recognizer_vendor": "google",
-      "speech_recognizer_language": "en"
-    });
-
-    //THEN
-    await p;
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
--- a/test/create-test-db.js
+++ b/test/create-test-db.js
@@ -2,14 +2,6 @@ const test = require('tape') ;
 const exec = require('child_process').exec ;
 const fs = require('fs');
 const {encrypt} = require('../lib/utils/encrypt-decrypt');
-const {
-  GCP_JSON_KEY,
-  AWS_ACCESS_KEY_ID,
-  AWS_SECRET_ACCESS_KEY,
-  AWS_REGION,
-  MICROSOFT_REGION,
-  MICROSOFT_API_KEY,
-} = require('../lib/config');

 test('creating jambones_test database', (t) => {
  exec(`mysql -h 127.0.0.1 -u root --protocol=tcp --port=3360 < ${__dirname}/db/create_test_db.sql`, (err, stdout, stderr) => {
@@ -27,24 +19,24 @@ test('creating schema', (t) => {
    t.pass('schema and test data successfully created');

    const sql = [];
-    if (GCP_JSON_KEY) {
-      const google_credential = encrypt(GCP_JSON_KEY);
+    if (process.env.GCP_JSON_KEY) {
+      const google_credential = encrypt(process.env.GCP_JSON_KEY);
      t.pass('adding google credentials');
      sql.push(`UPDATE speech_credentials SET credential='${google_credential}' WHERE vendor='google';`);
    }
-    if (AWS_ACCESS_KEY_ID && AWS_SECRET_ACCESS_KEY) {
+    if (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) {
      const aws_credential = encrypt(JSON.stringify({
-        access_key_id: AWS_ACCESS_KEY_ID,
-        secret_access_key: AWS_SECRET_ACCESS_KEY,
-        aws_region: AWS_REGION
+        access_key_id: process.env.AWS_ACCESS_KEY_ID,
+        secret_access_key: process.env.AWS_SECRET_ACCESS_KEY,
+        aws_region: process.env.AWS_REGION
      }));
      t.pass('adding aws credentials');
      sql.push(`UPDATE speech_credentials SET credential='${aws_credential}' WHERE vendor='aws';`);
    }
-    if (MICROSOFT_REGION && MICROSOFT_API_KEY) {
+    if (process.env.MICROSOFT_REGION && process.env.MICROSOFT_API_KEY) {
      const microsoft_credential = encrypt(JSON.stringify({
-        region: MICROSOFT_REGION,
-        api_key: MICROSOFT_API_KEY
+        region: process.env.MICROSOFT_REGION,
+        api_key: process.env.MICROSOFT_API_KEY
      }));
      t.pass('adding microsoft credentials');
      sql.push(`UPDATE speech_credentials SET credential='${microsoft_credential}' WHERE vendor='microsoft';`);
--- a/test/db/create-and-populate-schema.sql
+++ b/test/db/create-and-populate-schema.sql
--- a/test/db/jambones-sql.sql
+++ b/test/db/jambones-sql.sql
@@ -1,4 +1,5 @@
 /* SQLEditor (MySQL (2))*/
+
 SET FOREIGN_KEY_CHECKS=0;

 DROP TABLE IF EXISTS account_static_ips;
@@ -13,12 +14,8 @@ DROP TABLE IF EXISTS beta_invite_codes;

 DROP TABLE IF EXISTS call_routes;

-DROP TABLE IF EXISTS clients;
-
 DROP TABLE IF EXISTS dns_records;

-DROP TABLE IF EXISTS lcr;
-
 DROP TABLE IF EXISTS lcr_carrier_set_entry;

 DROP TABLE IF EXISTS lcr_routes;
@@ -55,8 +52,6 @@ DROP TABLE IF EXISTS smpp_addresses;

 DROP TABLE IF EXISTS speech_credentials;

-DROP TABLE IF EXISTS system_information;
-
 DROP TABLE IF EXISTS users;

 DROP TABLE IF EXISTS smpp_gateways;
@@ -129,16 +124,6 @@ application_sid CHAR(36) NOT NULL,
 PRIMARY KEY (call_route_sid)
 ) COMMENT='a regex-based pattern match for call routing';

-CREATE TABLE clients
-(
-client_sid CHAR(36) NOT NULL UNIQUE ,
-account_sid CHAR(36) NOT NULL,
-is_active BOOLEAN NOT NULL DEFAULT 1,
-username VARCHAR(64),
-password VARCHAR(1024),
-PRIMARY KEY (client_sid)
-);
-
 CREATE TABLE dns_records
 (
 dns_record_sid CHAR(36) NOT NULL UNIQUE ,
@@ -151,23 +136,11 @@ PRIMARY KEY (dns_record_sid)
 CREATE TABLE lcr_routes
 (
 lcr_route_sid CHAR(36),
-lcr_sid CHAR(36) NOT NULL,
 regex VARCHAR(32) NOT NULL COMMENT 'regex-based pattern match against dialed number, used for LCR routing of PSTN calls',
 description VARCHAR(1024),
-priority INTEGER NOT NULL COMMENT 'lower priority routes are attempted first',
+priority INTEGER NOT NULL UNIQUE  COMMENT 'lower priority routes are attempted first',
 PRIMARY KEY (lcr_route_sid)
-) COMMENT='An ordered list of  digit patterns in an LCR table.  The patterns are tested in sequence until one matches';
-
-CREATE TABLE lcr
-(
-lcr_sid CHAR(36) NOT NULL UNIQUE ,
-name VARCHAR(64) COMMENT 'User-assigned name for this LCR table',
-is_active BOOLEAN NOT NULL DEFAULT 1,
-default_carrier_set_entry_sid CHAR(36) COMMENT 'default carrier/route to use when no digit match based results are found.',
-service_provider_sid CHAR(36),
-account_sid CHAR(36),
-PRIMARY KEY (lcr_sid)
-) COMMENT='An LCR (least cost routing) table that is used by a service provider or account to make decisions about routing outbound calls when multiple carriers are available.';
+) COMMENT='Least cost routing table';

 CREATE TABLE password_settings
 (
@@ -275,10 +248,7 @@ CREATE TABLE sbc_addresses
 sbc_address_sid CHAR(36) NOT NULL UNIQUE ,
 ipv4 VARCHAR(255) NOT NULL,
 port INTEGER NOT NULL DEFAULT 5060,
-tls_port INTEGER,
-wss_port INTEGER,
 service_provider_sid CHAR(36),
-last_updated DATETIME,
 PRIMARY KEY (sbc_address_sid)
 );

@@ -334,17 +304,9 @@ last_tested DATETIME,
 tts_tested_ok BOOLEAN,
 stt_tested_ok BOOLEAN,
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-label VARCHAR(64),
 PRIMARY KEY (speech_credential_sid)
 );

-CREATE TABLE system_information
-(
-domain_name VARCHAR(255),
-sip_domain_name VARCHAR(255),
-monitoring_domain_name VARCHAR(255)
-);
-
 CREATE TABLE users
 (
 user_sid CHAR(36) NOT NULL UNIQUE ,
@@ -395,7 +357,6 @@ smpp_inbound_password VARCHAR(64),
 register_from_user VARCHAR(128),
 register_from_domain VARCHAR(255),
 register_public_ip_in_contact BOOLEAN NOT NULL DEFAULT false,
-register_status VARCHAR(4096),
 PRIMARY KEY (voip_carrier_sid)
 ) COMMENT='A Carrier or customer PBX that can send or receive calls';

@@ -424,7 +385,7 @@ PRIMARY KEY (smpp_gateway_sid)
 CREATE TABLE phone_numbers
 (
 phone_number_sid CHAR(36) UNIQUE ,
-number VARCHAR(132) NOT NULL,
+number VARCHAR(132) NOT NULL UNIQUE ,
 voip_carrier_sid CHAR(36),
 account_sid CHAR(36),
 application_sid CHAR(36),
@@ -442,7 +403,6 @@ inbound BOOLEAN NOT NULL COMMENT 'if true, whitelist this IP to allow inbound ca
 outbound BOOLEAN NOT NULL COMMENT 'if true, include in least-cost routing when placing calls to the PSTN',
 voip_carrier_sid CHAR(36) NOT NULL,
 is_active BOOLEAN NOT NULL DEFAULT 1,
-protocol ENUM('udp','tcp','tls', 'tls/srtp') DEFAULT 'udp' COMMENT 'Outbound call protocol',
 PRIMARY KEY (sip_gateway_sid)
 ) COMMENT='A whitelisted sip gateway used for origination/termination';

@@ -475,16 +435,13 @@ account_sid CHAR(36) COMMENT 'account that this application belongs to (if null,
 call_hook_sid CHAR(36) COMMENT 'webhook to call for inbound calls ',
 call_status_hook_sid CHAR(36) COMMENT 'webhook to call for call status events',
 messaging_hook_sid CHAR(36) COMMENT 'webhook to call for inbound SMS/MMS ',
-app_json TEXT,
+app_json VARCHAR(16384),
 speech_synthesis_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_synthesis_language VARCHAR(12) NOT NULL DEFAULT 'en-US',
 speech_synthesis_voice VARCHAR(64),
-speech_synthesis_label VARCHAR(64),
 speech_recognizer_vendor VARCHAR(64) NOT NULL DEFAULT 'google',
 speech_recognizer_language VARCHAR(64) NOT NULL DEFAULT 'en-US',
-speech_recognizer_label VARCHAR(64),
 created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-record_all_calls BOOLEAN NOT NULL DEFAULT false,
 PRIMARY KEY (application_sid)
 ) COMMENT='A defined set of behaviors to be applied to phone calls ';

@@ -522,9 +479,6 @@ subspace_client_secret VARCHAR(255),
 subspace_sip_teleport_id VARCHAR(255),
 subspace_sip_teleport_destinations VARCHAR(255),
 siprec_hook_sid CHAR(36),
-record_all_calls BOOLEAN NOT NULL DEFAULT false,
-record_format VARCHAR(16) NOT NULL DEFAULT 'mp3',
-bucket_credential VARCHAR(8192) COMMENT 'credential used to authenticate with storage service',
 PRIMARY KEY (account_sid)
 ) COMMENT='An enterprise that uses the platform for comm services';

@@ -545,20 +499,9 @@ ALTER TABLE call_routes ADD FOREIGN KEY account_sid_idxfk_3 (account_sid) REFERE

 ALTER TABLE call_routes ADD FOREIGN KEY application_sid_idxfk (application_sid) REFERENCES applications (application_sid);

-CREATE INDEX client_sid_idx ON clients (client_sid);
-ALTER TABLE clients ADD CONSTRAINT account_sid_idxfk_13 FOREIGN KEY account_sid_idxfk_13 (account_sid) REFERENCES accounts (account_sid);
-
 CREATE INDEX dns_record_sid_idx ON dns_records (dns_record_sid);
 ALTER TABLE dns_records ADD FOREIGN KEY account_sid_idxfk_4 (account_sid) REFERENCES accounts (account_sid);

-CREATE INDEX lcr_sid_idx ON lcr_routes (lcr_sid);
-ALTER TABLE lcr_routes ADD FOREIGN KEY lcr_sid_idxfk (lcr_sid) REFERENCES lcr (lcr_sid);
-
-CREATE INDEX lcr_sid_idx ON lcr (lcr_sid);
-ALTER TABLE lcr ADD FOREIGN KEY default_carrier_set_entry_sid_idxfk (default_carrier_set_entry_sid) REFERENCES lcr_carrier_set_entry (lcr_carrier_set_entry_sid);
-
-CREATE INDEX service_provider_sid_idx ON lcr (service_provider_sid);
-CREATE INDEX account_sid_idx ON lcr (account_sid);
 CREATE INDEX permission_sid_idx ON permissions (permission_sid);
 CREATE INDEX predefined_carrier_sid_idx ON predefined_carriers (predefined_carrier_sid);
 CREATE INDEX predefined_sip_gateway_sid_idx ON predefined_sip_gateways (predefined_sip_gateway_sid);
@@ -612,6 +555,8 @@ CREATE INDEX smpp_address_sid_idx ON smpp_addresses (smpp_address_sid);
 CREATE INDEX service_provider_sid_idx ON smpp_addresses (service_provider_sid);
 ALTER TABLE smpp_addresses ADD FOREIGN KEY service_provider_sid_idxfk_4 (service_provider_sid) REFERENCES service_providers (service_provider_sid);

+CREATE UNIQUE INDEX speech_credentials_idx_1 ON speech_credentials (vendor,account_sid);
+
 CREATE INDEX speech_credential_sid_idx ON speech_credentials (speech_credential_sid);
 CREATE INDEX service_provider_sid_idx ON speech_credentials (service_provider_sid);
 ALTER TABLE speech_credentials ADD FOREIGN KEY service_provider_sid_idxfk_5 (service_provider_sid) REFERENCES service_providers (service_provider_sid);
@@ -648,8 +593,6 @@ CREATE INDEX smpp_gateway_sid_idx ON smpp_gateways (smpp_gateway_sid);
 CREATE INDEX voip_carrier_sid_idx ON smpp_gateways (voip_carrier_sid);
 ALTER TABLE smpp_gateways ADD FOREIGN KEY voip_carrier_sid_idxfk (voip_carrier_sid) REFERENCES voip_carriers (voip_carrier_sid);

-CREATE UNIQUE INDEX phone_numbers_unique_idx_voip_carrier_number ON phone_numbers (number,voip_carrier_sid);
-
 CREATE INDEX phone_number_sid_idx ON phone_numbers (phone_number_sid);
 CREATE INDEX number_idx ON phone_numbers (number);
 CREATE INDEX voip_carrier_sid_idx ON phone_numbers (voip_carrier_sid);
@@ -704,4 +647,5 @@ ALTER TABLE accounts ADD FOREIGN KEY queue_event_hook_sid_idxfk (queue_event_hoo
 ALTER TABLE accounts ADD FOREIGN KEY device_calling_application_sid_idxfk (device_calling_application_sid) REFERENCES applications (application_sid);

 ALTER TABLE accounts ADD FOREIGN KEY siprec_hook_sid_idxfk (siprec_hook_sid) REFERENCES applications (application_sid);
+
 SET FOREIGN_KEY_CHECKS=1;
--- a/test/dial-tests.js
+++ b/test/dial-tests.js
@@ -5,8 +5,6 @@ const getJSON = bent('json')
 const clearModule = require('clear-module');
 const {provisionCallHook} = require('./utils')

-const sleepFor = (ms) => new Promise((r) => setTimeout(r, ms));
-
 process.on('unhandledRejection', (reason, p) => {
  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
 });
@@ -33,7 +31,6 @@ test('\'dial-phone\'', async(t) => {
      {
        "verb": "dial",
        "callerId": from,
-        "callerName": "test_callerName",
        "actionHook": "/actionHook",
        "timeLimit": 5,
        "target": [
@@ -45,11 +42,10 @@ test('\'dial-phone\'', async(t) => {
      }
    ];

-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);

    // THEN
    const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
-    await sleepFor(1000);

    let account_sid = '622f62e4-303a-49f2-bbe0-eb1e1714e37a';
    let post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
@@ -60,7 +56,6 @@ test('\'dial-phone\'', async(t) => {
        "method": "POST",
      },
      "from": from,
-      "callerName": "Tom",
      "to": {
        "type": "phone",
        "number": "15583084808"
@@ -87,7 +82,7 @@ test('\'dial-sip\'', async(t) => {
    try {
      await connect(srf);
      // wait for fs connected to drachtio server.
-      await sleepFor(1000);
+      await new Promise(r => setTimeout(r, 1000));
      // GIVEN
      const from = "dial_sip";
      let verbs = [
@@ -105,7 +100,7 @@ test('\'dial-sip\'', async(t) => {
        }
      ];
  
-      await provisionCallHook(from, verbs);
+      provisionCallHook(from, verbs);
  
      // THEN
      const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
@@ -172,7 +167,7 @@ test('\'dial-user\'', async(t) => {
        }
      ];
  
-      await provisionCallHook(from, verbs);
+      provisionCallHook(from, verbs);
  
      // THEN
      const p = sippUac('uas-dial.xml', '172.38.0.10', undefined, undefined, 2);
--- a/test/docker-compose-testbed.yaml
+++ b/test/docker-compose-testbed.yaml
@@ -42,7 +42,7 @@ services:
        ipv4_address: 172.38.0.7

  drachtio:
-    image: drachtio/drachtio-server:0.8.22
+    image: drachtio/drachtio-server:latest
    restart: always
    command: drachtio --contact "sip:*;transport=udp" --mtu 4096 --address 0.0.0.0 --port 9022
    ports:
@@ -57,7 +57,7 @@ services:
        condition: service_healthy

  freeswitch:
-    image: drachtio/drachtio-freeswitch-mrf:0.4.33
+    image: drachtio/drachtio-freeswitch-mrf:0.4.18
    restart: always
    command: freeswitch --rtp-range-start 20000 --rtp-range-end 20100
    environment:
--- a/test/gather-tests.js
+++ b/test/gather-tests.js
@@ -4,15 +4,6 @@ const bent = require('bent');
 const getJSON = bent('json')
 const clearModule = require('clear-module');
 const {provisionCallHook} = require('./utils')
-const {
-  GCP_JSON_KEY,
-  AWS_ACCESS_KEY_ID,
-  AWS_SECRET_ACCESS_KEY,
-  SONIOX_API_KEY,
-  DEEPGRAM_API_KEY,
-  MICROSOFT_REGION,
-  MICROSOFT_API_KEY,
-} = require('../lib/config');

 process.on('unhandledRejection', (reason, p) => {
  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -27,7 +18,7 @@ function connect(connectable) {
 }

 test('\'gather\' test - google', async(t) => {
-  if (!GCP_JSON_KEY) {
+  if (!process.env.GCP_JSON_KEY) {
    t.pass('skipping google tests');
    return t.end();
  }
@@ -50,7 +41,7 @@ test('\'gather\' test - google', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -67,7 +58,7 @@ test('\'gather\' test - google', async(t) => {
 });

 test('\'gather\' test - default (google)', async(t) => {
-  if (!GCP_JSON_KEY) {
+  if (!process.env.GCP_JSON_KEY) {
    t.pass('skipping google tests');
    return t.end();
  }
@@ -86,7 +77,7 @@ test('\'gather\' test - default (google)', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -102,55 +93,8 @@ test('\'gather\' test - default (google)', async(t) => {
  }
 });

-test('\'config\' test - reset to app defaults', async(t) => {
-  if (!GCP_JSON_KEY) {
-    t.pass('skipping config tests');
-    return t.end();
-  }
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-    // GIVEN
-    let verbs = [
-      {
-        "verb": "config",
-        "recognizer": {
-          "vendor": "google",
-          "language": "fr-FR"
-        },
-      },
-      {
-        "verb": "config",
-        "reset": ['recognizer'],
-      },
-      {
-        "verb": "gather",
-        "input": ["speech"],
-        "timeout": 10,
-        "actionHook": "/actionHook"
-      }
-    ];
-    let from = "gather_success";
-    await provisionCallHook(from, verbs);
-    // THEN
-    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    //console.log(JSON.stringify(obj));
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase() === 'i\'d like to speak to customer support',
-      'config: resets recognizer to app defaults');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
 test('\'gather\' test - microsoft', async(t) => {
-  if (!MICROSOFT_REGION || !MICROSOFT_API_KEY) {
+  if (!process.env.MICROSOFT_REGION || !process.env.MICROSOFT_API_KEY) {
    t.pass('skipping microsoft tests');
    return t.end();
  }
@@ -173,7 +117,7 @@ test('\'gather\' test - microsoft', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -190,7 +134,7 @@ test('\'gather\' test - microsoft', async(t) => {
 });

 test('\'gather\' test - aws', async(t) => {
-  if (!AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY) {
+  if (!process.env.AWS_ACCESS_KEY_ID || !process.env.AWS_SECRET_ACCESS_KEY) {
    t.pass('skipping aws tests');
    return t.end();
  }
@@ -213,7 +157,7 @@ test('\'gather\' test - aws', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -230,7 +174,7 @@ test('\'gather\' test - aws', async(t) => {
 });

 test('\'gather\' test - deepgram', async(t) => {
-  if (!DEEPGRAM_API_KEY ) {
+  if (!process.env.DEEPGRAM_API_KEY ) {
    t.pass('skipping deepgram tests');
    return t.end();
  }
@@ -248,7 +192,7 @@ test('\'gather\' test - deepgram', async(t) => {
          "vendor": "deepgram",
          "hints": ["customer support", "sales", "human resources", "HR"],
          "deepgramOptions": {
-            "apiKey": DEEPGRAM_API_KEY
+            "apiKey": process.env.DEEPGRAM_API_KEY
          }
        },
        "timeout": 10,
@@ -256,12 +200,12 @@ test('\'gather\' test - deepgram', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
    //console.log(JSON.stringify(obj));
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().includes('like to speak to customer support'),
+    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
      'gather: succeeds when using deepgram credentials');
    disconnect();
  } catch (err) {
@@ -272,7 +216,7 @@ test('\'gather\' test - deepgram', async(t) => {
 });

 test('\'gather\' test - soniox', async(t) => {
-  if (!SONIOX_API_KEY ) {
+  if (!process.env.SONIOX_API_KEY ) {
    t.pass('skipping soniox tests');
    return t.end();
  }
@@ -290,7 +234,7 @@ test('\'gather\' test - soniox', async(t) => {
          "vendor": "deepgram",
          "hints": ["customer support", "sales", "human resources", "HR"],
          "deepgramOptions": {
-            "apiKey": SONIOX_API_KEY
+            "apiKey": process.env.SONIOX_API_KEY
          }
        },
        "timeout": 10,
@@ -298,7 +242,7 @@ test('\'gather\' test - soniox', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
--- a/test/index.js
+++ b/test/index.js
@@ -14,6 +14,5 @@ require('./play-tests');
 require('./sip-refer-tests');
 require('./listen-tests');
 require('./config-test');
-require('./queue-test');
 require('./remove-test-db');
 require('./docker_stop');
--- a/test/listen-tests.js
+++ b/test/listen-tests.js
@@ -35,7 +35,7 @@ test('\'listen-success\'', async(t) => {
      }
    ];

-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success-send-bye.xml', '172.38.0.10', from);
@@ -57,7 +57,7 @@ test('\'listen-success\'', async(t) => {
  }
 });

-test.skip('\'listen-maxLength\'', async(t) => {
+test('\'listen-maxLength\'', async(t) => {
  clearModule.all();
  const {srf, disconnect} = require('../app');
  try {
@@ -69,13 +69,13 @@ test.skip('\'listen-maxLength\'', async(t) => {
      {
        "verb": "listen",
        "url": `ws://172.38.0.60:3000/${from}`,
-        "mixType" : "stereo",
+        "mixType" : "mixed",
        "timeout": 2,
        "maxLength": 2
      }
    ];

-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);

    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
@@ -109,7 +109,7 @@ test('\'listen-pause-resume\'', async(t) => {
      }
    ];

-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);

    // THEN
    const p = sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
--- a/test/play-tests.js
+++ b/test/play-tests.js
@@ -33,7 +33,7 @@ test('\'play\' tests single link in plain text', async(t) => {
    ];

    const from = 'play_single_link';
-    await provisionCallHook(from, verbs)
+    provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -62,7 +62,7 @@ test('\'play\' tests multi links in array', async(t) => {
    ];

    const from = 'play_multi_links_in_array';
-    await provisionCallHook(from, verbs)
+    provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -100,8 +100,8 @@ test('\'play\' tests single link in conference', async(t) => {
        waitHook: `/customHook`
      }
    ];
-    await provisionCustomHook(from, waitHookVerbs)
-    await provisionCallHook(from, verbs)
+    provisionCustomHook(from, waitHookVerbs)
+    provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-send-bye.xml', '172.38.0.10', from);
@@ -141,8 +141,8 @@ test('\'play\' tests multi links in array in conference', async(t) => {
        waitHook: `/customHook`
      }
    ];
-    await provisionCustomHook(from, waitHookVerbs)
-    await provisionCallHook(from, verbs)
+    provisionCustomHook(from, waitHookVerbs)
+    provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-send-bye.xml', '172.38.0.10', from);
@@ -178,8 +178,8 @@ test('\'play\' tests with seekOffset and actionHook', async(t) => {
    const waitHookVerbs = [];

    const from = 'play_action_hook';
-    await provisionCallHook(from, verbs)
-    await provisionCustomHook(from, waitHookVerbs)
+    provisionCallHook(from, verbs)
+    provisionCustomHook(from, waitHookVerbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -218,7 +218,7 @@ test('\'play\' tests with earlymedia', async(t) => {
    ];

    const from = 'play_early_media';
-    await provisionCallHook(from, verbs)
+    provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-invite-expect-183-cancel.xml', '172.38.0.10', from);
--- a/test/queue-test.js
+++ b/test/queue-test.js
@@ -1,127 +0,0 @@
-const test = require('tape');
-const { sippUac } = require('./sipp')('test_fs');
-const clearModule = require('clear-module');
-const {provisionCallHook, provisionActionHook, provisionAnyHook} = require('./utils');
-const bent = require('bent');
-const getJSON = bent('json');
-
-process.on('unhandledRejection', (reason, p) => {
-  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-function connect(connectable) {
-  return new Promise((resolve, reject) => {
-    connectable.on('connect', () => {
-      return resolve();
-    });
-  });
-}
-
-const sleepFor = (ms) => new Promise((resolve) => setTimeout(() => resolve(), ms));
-
-test('\'enqueue-dequeue\' tests', async(t) => {
-
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-  try {
-    await connect(srf);
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'enqueue',
-        name: 'support',
-        actionHook: '/actionHook'
-      }
-    ];
-
-    const verbs2 = [
-      {
-        verb: 'dequeue',
-        name: 'support'
-      }
-    ];
-
-    const actionVerbs = [
-      {
-        verb: 'play',
-        url: 'silence_stream://1000',
-        earlyMedia: true
-      }
-    ];
-
-    const from = 'enqueue_success';
-    await provisionCallHook(from, verbs);
-    await provisionActionHook(from, actionVerbs)
-
-    const from2 = 'dequeue_success';
-    await provisionCallHook(from2, verbs2);
-    
-
-    // THEN
-    const p1 = sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
-
-    await sleepFor(1000);
-
-    const p2 = sippUac('uac-success-send-bye.xml', '172.38.0.11', from2);
-    await Promise.all([p1, p2]);
-    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    t.ok(obj.body.queue_result === 'bridged');
-    t.pass('enqueue-dequeue: succeeds connect');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\leave\' tests', async(t) => {
-
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-  try {
-    await connect(srf);
-    // GIVEN
-    const verbs = [
-      {
-        verb: 'enqueue',
-        name: 'support1',
-        waitHook: '/anyHook/enqueue_success_leave',
-        actionHook: '/actionHook'
-      }
-    ];
-
-    const anyHookVerbs = [
-      {
-        verb: 'leave'
-      }
-    ];
-
-        const actionVerbs = [
-      {
-        verb: 'play',
-        url: 'silence_stream://1000',
-        earlyMedia: true
-      }
-    ];
-
-    const from = 'enqueue_success_leave';
-    await provisionCallHook(from, verbs);
-    await provisionAnyHook(from, anyHookVerbs);
-    await provisionActionHook(from, actionVerbs)
-    
-
-    // THEN
-    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
-    const obj  = await getJSON(`http:127.0.0.1:3100/lastRequest/enqueue_success_leave`);
-    t.ok(obj.body.queue_position === 0);
-    const obj1  = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    t.ok(obj1.body.queue_result === 'leave');
-    t.pass('enqueue-dequeue: succeeds connect');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
--- a/test/say-tests.js
+++ b/test/say-tests.js
@@ -31,7 +31,7 @@ test('\'say\' tests', async(t) => {
    ];

    const from = 'say_test_success';
-    await provisionCallHook(from, verbs)
+    provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
@@ -43,84 +43,3 @@ test('\'say\' tests', async(t) => {
    t.error(err);
  }
 });
-
-test('\'config\' reset synthesizer tests', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        "verb": "config",
-        "synthesizer": {
-          "vendor": "microsft",
-          "voice": "foobar"
-        },
-      },
-      {
-        "verb": "config",
-        "reset": 'synthesizer',
-      },
-      {
-        verb: 'say',
-        text: 'hello'
-      }
-    ];
-
-    const from = 'say_test_success';
-    await provisionCallHook(from, verbs)
-
-    // THEN
-    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
-    t.pass('say: succeeds when using using account credentials');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-const {MICROSOFT_CUSTOM_API_KEY, MICROSOFT_DEPLOYMENT_ID, MICROSOFT_CUSTOM_REGION, MICROSOFT_CUSTOM_VOICE} = process.env;
-if (MICROSOFT_CUSTOM_API_KEY && MICROSOFT_DEPLOYMENT_ID && MICROSOFT_CUSTOM_REGION && MICROSOFT_CUSTOM_VOICE) {
-  test('\'say\' tests - microsoft custom voice', async(t) => {
-    clearModule.all();
-    const {srf, disconnect} = require('../app');
-
-    try {
-      await connect(srf);
-
-      // GIVEN
-      const verbs = [
-        {
-          verb: 'say',
-          text: 'hello',
-          synthesizer: {
-            vendor: 'microsoft',
-            voice: MICROSOFT_CUSTOM_VOICE,
-            options: {
-              deploymentId: MICROSOFT_DEPLOYMENT_ID,
-              apiKey: MICROSOFT_CUSTOM_API_KEY,
-              region: MICROSOFT_CUSTOM_REGION,
-            }
-          }
-        }
-      ];
-
-      const from = 'say_test_success';
-      await provisionCallHook(from, verbs)
-
-      // THEN
-      await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
-      t.pass('say: succeeds when using microsoft custom voice');
-      disconnect();
-    } catch (err) {
-      console.log(`error received: ${err}`);
-      disconnect();
-      t.error(err);
-    }
-  });
-}
--- a/test/sip-refer-tests.js
+++ b/test/sip-refer-tests.js
@@ -41,8 +41,8 @@ test('\'refer\' tests w/202 and NOTIFY', {timeout: 25000}, async(t) => {
    const noVerbs = [];

    const from = 'refer_with_notify';
-    await provisionCallHook(from, verbs);
-    await provisionActionHook(from, noVerbs)
+    provisionCallHook(from, verbs);
+    provisionActionHook(from, noVerbs)

    // THEN
    await sippUac('uac-refer-with-notify.xml', '172.38.0.10', from);
@@ -81,8 +81,8 @@ test('\'refer\' tests w/202 but no NOTIFY', {timeout: 25000}, async(t) => {
    const noVerbs = [];

    const from = 'refer_no_notify';
-    await provisionCallHook(from, verbs);
-    await provisionActionHook(from, noVerbs)
+    provisionCallHook(from, verbs);
+    provisionActionHook(from, noVerbs)

    // THEN
    await sippUac('uac-refer-no-notify.xml', '172.38.0.10', from);
--- a/test/sip-request-tests.js
+++ b/test/sip-request-tests.js
@@ -40,7 +40,7 @@ test('sending SIP in-dialog requests tests', async(t) => {
      }
    ];
    let from = "sip_indialog_test";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-send-info-during-dialog.xml', '172.38.0.10', from);
    const obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
--- a/test/sipp.js
+++ b/test/sipp.js
@@ -36,7 +36,7 @@ obj.sippUac = (file, bindAddress, from='sipp', to='16174000000', loop=1) => {
    '-cid_str', `%u-%p@%s-${idx++}`,
    '172.38.0.50',
    '-key','from', from,
-    '-key','to', to, '-trace_msg', '-trace_err'
+    '-key','to', to, '-trace_msg'
  ];

  if (bindAddress) args.splice(5, 0, '--ip', bindAddress);
--- a/test/transcribe-tests.js
+++ b/test/transcribe-tests.js
@@ -4,15 +4,6 @@ const bent = require('bent');
 const getJSON = bent('json')
 const clearModule = require('clear-module');
 const {provisionCallHook} = require('./utils')
-const {
-  GCP_JSON_KEY,
-  AWS_ACCESS_KEY_ID,  
-  AWS_SECRET_ACCESS_KEY,
-  MICROSOFT_REGION,
-  MICROSOFT_API_KEY,
-  SONIOX_API_KEY,
-  DEEPGRAM_API_KEY,
-} = require('../lib/config');

 process.on('unhandledRejection', (reason, p) => {
  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -27,7 +18,7 @@ function connect(connectable) {
 }

 test('\'transcribe\' test - google', async(t) => {
-  if (!GCP_JSON_KEY) {
+  if (!process.env.GCP_JSON_KEY) {
    t.pass('skipping google tests');
    return t.end();
  }
@@ -48,7 +39,7 @@ test('\'transcribe\' test - google', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -64,7 +55,7 @@ test('\'transcribe\' test - google', async(t) => {
 });

 test('\'transcribe\' test - microsoft', async(t) => {
-  if (!MICROSOFT_REGION || !MICROSOFT_API_KEY) {
+  if (!process.env.MICROSOFT_REGION || !process.env.MICROSOFT_API_KEY) {
    t.pass('skipping microsoft tests');
    return t.end();
  }
@@ -85,7 +76,7 @@ test('\'transcribe\' test - microsoft', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -101,7 +92,7 @@ test('\'transcribe\' test - microsoft', async(t) => {
 });

 test('\'transcribe\' test - aws', async(t) => {
-  if (!AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY) {
+  if (!process.env.AWS_ACCESS_KEY_ID || !process.env.AWS_SECRET_ACCESS_KEY) {
    t.pass('skipping aws tests');
    return t.end();
  }
@@ -122,7 +113,7 @@ test('\'transcribe\' test - aws', async(t) => {
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
@@ -138,7 +129,7 @@ test('\'transcribe\' test - aws', async(t) => {
 });

 test('\'transcribe\' test - deepgram', async(t) => {
-  if (!DEEPGRAM_API_KEY ) {
+  if (!process.env.DEEPGRAM_API_KEY ) {
    t.pass('skipping deepgram tests');
    return t.end();
  }
@@ -155,18 +146,18 @@ test('\'transcribe\' test - deepgram', async(t) => {
          "vendor": "deepgram",
          "hints": ["customer support", "sales", "human resources", "HR"],
          "deepgramOptions": {
-            "apiKey": DEEPGRAM_API_KEY
+            "apiKey": process.env.DEEPGRAM_API_KEY
          }
        },
        "transcriptionHook": "/transcriptionHook"
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().includes('like to speak to customer support'),
+    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
      'transcribe: succeeds when using deepgram credentials');

    disconnect();
@@ -178,7 +169,7 @@ test('\'transcribe\' test - deepgram', async(t) => {
 });

 test('\'transcribe\' test - soniox', async(t) => {
-  if (!SONIOX_API_KEY ) {
+  if (!process.env.SONIOX_API_KEY ) {
    t.pass('skipping soniox tests');
    return t.end();
  }
@@ -195,59 +186,21 @@ test('\'transcribe\' test - soniox', async(t) => {
          "vendor": "soniox",
          "hints": ["customer support", "sales", "human resources", "HR"],
          "deepgramOptions": {
-            "apiKey": SONIOX_API_KEY
+            "apiKey": process.env.SONIOX_API_KEY
          }
        },
        "transcriptionHook": "/transcriptionHook"
      }
    ];
    let from = "gather_success";
-    await provisionCallHook(from, verbs);
+    provisionCallHook(from, verbs);
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    //console.log(JSON.stringify(obj));
+    console.log(JSON.stringify(obj));
    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
      'transcribe: succeeds when using soniox credentials');

-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-test('\'transcribe\' test - google with asrTimeout', async(t) => {
-  if (!GCP_JSON_KEY) {
-    t.pass('skipping google tests');
-    return t.end();
-  }
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-    // GIVEN
-    let verbs = [
-      {
-        "verb": "transcribe",
-        "recognizer": {
-          "vendor": "google",
-          "hints": ["customer support", "sales", "human resources", "HR"],
-          "asrTimeout": 4
-        },
-        "transcriptionHook": "/transcriptionHook"
-      }
-    ];
-    let from = "gather_success";
-    await provisionCallHook(from, verbs);
-    // THEN
-    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
-      'transcribe: succeeds when using google credentials');
-
    disconnect();
  } catch (err) {
    console.log(`error received: ${err}`);
--- a/test/utils.js
+++ b/test/utils.js
@@ -6,40 +6,31 @@ const bent = require('bent');
 * The function help testcase to register desired jambonz json response for an application call
 * When a call has From number match the registered hook event, the desired jambonz json will be responded.
 */
-const provisionCallHook = async (from, verbs) => {
+const provisionCallHook = (from, verbs) => {
  const mapping = {
    from,
    data: JSON.stringify(verbs)
  };
  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  await post('/appMapping', mapping);
+  post('/appMapping', mapping);
 }

-const provisionCustomHook = async(from, verbs) => {
+const provisionCustomHook = (from, verbs) => {
  const mapping = {
    from,
    data: JSON.stringify(verbs)
  };
  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  await post(`/customHookMapping`, mapping);
+  post(`/customHookMapping`, mapping);
 }

-const provisionActionHook = async(from, verbs) => {
+const provisionActionHook = (from, verbs) => {
  const mapping = {
    from,
    data: JSON.stringify(verbs)
  };
  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  await post(`/actionHook`, mapping);
+  post(`/actionHook`, mapping);
 }

-const provisionAnyHook = async(key, verbs) => {
-  const mapping = {
-    key,
-    data: JSON.stringify(verbs)
-  };
-  const post = bent('http://127.0.0.1:3100', 'POST', 'string', 200);
-  await post(`/anyHookMapping`, mapping);
-}
-
-module.exports = { provisionCallHook, provisionCustomHook, provisionActionHook, provisionAnyHook}
+module.exports = { provisionCallHook, provisionCustomHook, provisionActionHook}
--- a/test/webhook/app.js
+++ b/test/webhook/app.js
@@ -2,7 +2,6 @@ const express = require('express');
 const app = express();
 const Websocket = require('ws');
 const listenPort = process.env.HTTP_PORT || 3000;
-const any_hook_json_mapping = new Map();
 let json_mapping = new Map();
 let hook_mapping = new Map();
 let ws_packet_count = new Map();
@@ -62,7 +61,7 @@ app.all('/', (req, res) => {
  console.log(req.body, 'POST /');
  const key = req.body.from
  addRequestToMap(key, req, hook_mapping);
-  return getJsonFromMap(json_mapping, key, req, res);
+  return getJsonFromMap(key, req, res);
 });

 app.post('/appMapping', (req, res) => {
@@ -107,7 +106,7 @@ app.post('/actionHook', (req, res) => {
 app.all('/customHook', (req, res) => {
  let key = `${req.body.from}_customHook`;;
  console.log(req.body, `POST /customHook`);
-  return getJsonFromMap(json_mapping, key, req, res);
+  return getJsonFromMap(key, req, res);
 });

 app.post('/customHookMapping', (req, res) => {
@@ -117,23 +116,6 @@ app.post('/customHookMapping', (req, res) => {
  return res.sendStatus(200);
 });

-/**
- * Any Hook
- */
-
-app.all('/anyHook/:key', (req, res) => {
-  let key = req.params.key;
-  console.log(req.body, `POST /anyHook/${key}`);
-  return getJsonFromMap(any_hook_json_mapping, key, req, res);
-});
-
-app.post('/anyHookMapping', (req, res) => {
-  let key = req.body.key;
-  console.log(req.body, `POST /anyHookMapping/${key}`);
-  any_hook_json_mapping.set(key, req.body.data);
-  return res.sendStatus(200);
-});
-
 // Fetch Requests
 app.get('/requests/:key', (req, res) => {
  let key = req.params.key;
@@ -180,9 +162,9 @@ app.get('/ws_metadata/:key', (req, res) => {
 * private function
 */

-function getJsonFromMap(map, key, req, res) {
-  if (!map.has(key)) return res.sendStatus(404);
-  const retData = JSON.parse(map.get(key));
+function getJsonFromMap(key, req, res) {
+  if (!json_mapping.has(key)) return res.sendStatus(404);
+  const retData = JSON.parse(json_mapping.get(key));
  console.log(retData, ` Response to ${req.method} ${req.url}`);
  addRequestToMap(key, req, hook_mapping);
  return res.json(retData);
--- a/test/webhooks-tests.js
+++ b/test/webhooks-tests.js
@@ -2,17 +2,13 @@ const test = require('tape');
 const { sippUac } = require('./sipp')('test_fs');
 const clearModule = require('clear-module');
 const {provisionCallHook} = require('./utils')
-const {
-  JAMBONES_LOGLEVEL,
-  JAMBONES_TIME_SERIES_HOST
-} = require('../lib/config');
 const opts = {
  timestamp: () => {return `, "time": "${new Date().toISOString()}"`;},
-  level: JAMBONES_LOGLEVEL
+  level: process.env.JAMBONES_LOGLEVEL || 'info'
 };
 const logger = require('pino')(opts);
 const { queryAlerts } = require('@jambonz/time-series')(
-  logger, JAMBONES_TIME_SERIES_HOST
+  logger, process.env.JAMBONES_TIME_SERIES_HOST
 );

 process.on('unhandledRejection', (reason, p) => {
@@ -45,7 +41,7 @@ test('basic webhook tests', async(t) => {
    ];

    const from = 'sip_decline_test_success';
-    await provisionCallHook(from, verbs)
+    provisionCallHook(from, verbs)

    await sippUac('uac-expect-603.xml', '172.38.0.10', from);
    t.pass('webhook successfully declines call');
@@ -73,7 +69,7 @@ test('invalid jambonz json create alert tests', async(t) => {
    };

    const from = 'invalid_json_create_alert';
-    await provisionCallHook(from, verbs)
+    provisionCallHook(from, verbs)

    // THEN
    await sippUac('uac-invite-expect-480.xml', '172.38.0.10', from);
--- a/test/ws-requestor-unit-test.js
+++ b/test/ws-requestor-unit-test.js
@@ -3,10 +3,7 @@ const sinon = require('sinon');
 const proxyquire = require("proxyquire");
 proxyquire.noCallThru();
 const MockWebsocket = require('./ws-mock')
-const {
-  JAMBONES_LOGLEVEL,  
-} = require('../lib/config');
-const logger = require('pino')({level: JAMBONES_LOGLEVEL});
+const logger = require('pino')({level: process.env.JAMBONES_LOGLEVEL || 'error'});

 const BaseRequestor = proxyquire(
  "../lib/utils/base-requestor",
--- a/tracer.js
+++ b/tracer.js
@@ -7,16 +7,12 @@ const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
 const  { OTLPTraceExporter } = require ('@opentelemetry/exporter-trace-otlp-http');
-const {
-  JAMBONES_OTEL_ENABLED,
-  OTEL_EXPORTER_JAEGER_AGENT_HOST,
-  OTEL_EXPORTER_JAEGER_ENDPOINT,
-  OTEL_EXPORTER_ZIPKIN_URL,
-  OTEL_EXPORTER_COLLECTOR_URL
-} = require('./lib/config');
+//const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
+//const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
+//const { PinoInstrumentation } = require('@opentelemetry/instrumentation-pino');

 module.exports = (serviceName) => {
-  if (JAMBONES_OTEL_ENABLED) {
+  if (process.env.JAMBONES_OTEL_ENABLED) {
    const {version} = require('./package.json');
    const provider = new NodeTracerProvider({
      resource: new Resource({
@@ -26,15 +22,15 @@ module.exports = (serviceName) => {
    });

    let exporter;
-    if (OTEL_EXPORTER_JAEGER_AGENT_HOST  || OTEL_EXPORTER_JAEGER_ENDPOINT) {
+    if (process.env.OTEL_EXPORTER_JAEGER_AGENT_HOST  || process.env.OTEL_EXPORTER_JAEGER_ENDPOINT) {
      exporter = new JaegerExporter();
    }
-    else if (OTEL_EXPORTER_ZIPKIN_URL) {
-      exporter = new ZipkinExporter({url:OTEL_EXPORTER_ZIPKIN_URL});
+    else if (process.env.OTEL_EXPORTER_ZIPKIN_URL) {
+      exporter = new ZipkinExporter({url:process.env.OTEL_EXPORTER_ZIPKIN_URL});
    }
    else {
      exporter = new OTLPTraceExporter({
-        url: OTEL_EXPORTER_COLLECTOR_URL
+        url: process.OTEL_EXPORTER_COLLECTOR_URL
      });
    }
Author	SHA1	Message	Date
Dave Horton	1c118b171c	further refinement	2023-04-10 09:27:28 -04:00
Dave Horton	0cde92798d	improve deprecated syntax	2023-04-10 09:20:49 -04:00
Dave Horton	45045fd39b	improve deprecated syntax	2023-04-10 09:12:41 -04:00
Dave Horton	92da5518eb	try 5	2023-04-10 09:08:54 -04:00
Dave Horton	1126ea827f	try 4	2023-04-10 09:02:39 -04:00
Dave Horton	fcc4c0a5ce	try 3	2023-04-10 09:00:19 -04:00
Dave Horton	ba3ff42987	try 2	2023-04-10 08:56:44 -04:00
Dave Horton	765311c491	interpolate tags	2023-04-10 08:53:57 -04:00
Dave Horton	dcd8b378b2	use docker/build-push-action@v4	2023-04-10 08:49:44 -04:00
Quan HL	552a4e9fd1	feat: upload docker image to docker hub	2023-04-10 15:12:50 +07:00