diff --git a/packages/basic.gblib/services/DebuggerService.ts b/packages/basic.gblib/services/DebuggerService.ts
index 3380192e..d036e95d 100644
--- a/packages/basic.gblib/services/DebuggerService.ts
+++ b/packages/basic.gblib/services/DebuggerService.ts
@@ -273,7 +273,7 @@ export class DebuggerService {
 
   public async getRunning ({ botId, botApiKey, scriptName }) {
     let error;
-    botId = botId[0]; // TODO: Handle call in POST.
+    botId = botId[0];
     if (!GBServer.globals.debuggers[botId]) {
       GBServer.globals.debuggers[botId] = {};
     }
diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
index 5acb1193..b28e542f 100644
--- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
+++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
@@ -130,10 +130,6 @@ export class WhatsappDirectLine extends GBService {
       case 'GeneralBots':
         const minBoot = GBServer.globals.minBoot as any;
 
-        // TODO:  REMOVE THIS.
-        if (minBoot.botId !== this.botId) {
-          this.customClient = minBoot.whatsAppDirectLine.customClient;
-        } else {
           // Initialize the browser using a local profile for each bot.
 
           const gbaiName = `${this.min.botId}.gbai`;
@@ -251,7 +247,7 @@ export class WhatsappDirectLine extends GBService {
           await createClient.bind(this)(this.browserWSEndpoint);
 
           setUrl = false;
-        }
+
         break;
 
       case 'chatapi':