diff --git a/packages/framework/src/Lib/CommandContext.ts b/packages/framework/src/Lib/CommandContext.ts
index 7441cdca..a6da9ad7 100644
--- a/packages/framework/src/Lib/CommandContext.ts
+++ b/packages/framework/src/Lib/CommandContext.ts
@@ -36,7 +36,7 @@ export class CommandContext {
 
             return this.interaction.reply(options);
         }
-        return this.message.client.sendMessage(options, this.message.channelId);
+        return this.message.client.sendMessage(options, this.message.channelId!);
     }
 
     public get guildId(): string | undefined {
diff --git a/services/kanao-gateway/src/Structures/KanaoGateway.ts b/services/kanao-gateway/src/Structures/KanaoGateway.ts
index 211d1372..51510d99 100644
--- a/services/kanao-gateway/src/Structures/KanaoGateway.ts
+++ b/services/kanao-gateway/src/Structures/KanaoGateway.ts
@@ -153,7 +153,6 @@ export class NezuGateway extends EventEmitter {
                     await channel.bindQueue(queue, RabbitMQ.GATEWAY_QUEUE_STATS, route);
                 }
 
-                // TODO [2024-02-20]: Implement this
                 await channel.consume(queue, async message => {
                     if (!message) return;
                     const content = JSON.parse(message.content.toString()) as { route: string; };