diff --git a/src/cli.mjs b/src/cli.mjs
index e95e84f8..fcb407c7 100644
--- a/src/cli.mjs
+++ b/src/cli.mjs
@@ -141,7 +141,7 @@ function buildYargs(argvInput) {
           .filter((key) => previousWord === key)
           .pop();
 
-        // TODO: this doesn't handle aliasing, and it needs to
+        // This doesn't handle aliasing, and it needs to
         if (
           currentWord === "--profile" ||
           currentWordFlag === "profile" ||
diff --git a/src/commands/shell.mjs b/src/commands/shell.mjs
index 2c234d23..ce25dd4b 100644
--- a/src/commands/shell.mjs
+++ b/src/commands/shell.mjs
@@ -35,7 +35,6 @@ async function shellCommand(argv) {
     prompt: `${argv.database || ""}> `,
     ignoreUndefined: true,
     preview: argv.apiVersion !== "10",
-    // TODO: integrate with fql-analyzer for completions
     completer: argv.apiVersion === "10" ? () => [] : undefined,
     output: container.resolve("stdoutStream"),
     input: container.resolve("stdinStream"),
diff --git a/src/lib/auth/accountKeys.mjs b/src/lib/auth/accountKeys.mjs
index 815147c7..794e192e 100644
--- a/src/lib/auth/accountKeys.mjs
+++ b/src/lib/auth/accountKeys.mjs
@@ -81,7 +81,7 @@ export class AccountKeys {
   async getOrRefreshKey() {
     if (this.keySource === "credentials-file") {
       const key = this.keyStore.get();
-      // TODO: track ttl for account and refresh keys
+
       if (!key) {
         this.logger.debug(
           "Found account key, but it is expired. Refreshing...",
diff --git a/src/lib/auth/credentials.mjs b/src/lib/auth/credentials.mjs
index 852d223e..e7533e6a 100644
--- a/src/lib/auth/credentials.mjs
+++ b/src/lib/auth/credentials.mjs
@@ -64,7 +64,6 @@ export class Credentials {
     this.accountKeys.keyStore.save({
       accountKey,
       refreshToken,
-      // TODO: set expiration
     });
     this.accountKeys.key = accountKey;
   }
diff --git a/src/lib/fauna-account-client.mjs b/src/lib/fauna-account-client.mjs
index efea7696..7d823e65 100644
--- a/src/lib/fauna-account-client.mjs
+++ b/src/lib/fauna-account-client.mjs
@@ -131,8 +131,6 @@ export class FaunaAccountClient {
    * @returns {Promise<{accountKey: string, refreshToken: string}>} - The session information.
    * @throws {Error} - Throws an error if there is an issue during session retrieval.
    */
-
-  // TODO: get/set expiration details
   static async getSession(accessToken) {
     const makeAccountRequest = container.resolve("makeAccountRequest");
     try {
@@ -149,7 +147,6 @@ export class FaunaAccountClient {
     }
   }
 
-  // TODO: get/set expiration details
   /**
    * Uses refreshToken to get a new accountKey and refreshToken.
    * @param {*} refreshToken
diff --git a/src/lib/middleware.mjs b/src/lib/middleware.mjs
index 3bdcc6dc..11402e68 100644
--- a/src/lib/middleware.mjs
+++ b/src/lib/middleware.mjs
@@ -43,7 +43,6 @@ export function fixPaths(argv) {
 }
 
 export function checkForUpdates(argv) {
-  // TODO: figure out upgrade path for SEA installations
   if (isSea()) return argv;
 
   const __filename = fileURLToPath(import.meta.url);
diff --git a/test/schema/commit.mjs b/test/schema/commit.mjs
index c0e89103..30f8e2c8 100644
--- a/test/schema/commit.mjs
+++ b/test/schema/commit.mjs
@@ -91,7 +91,6 @@ describe("schema commit", function () {
   });
 
   it("errors if the schema is not in a ready state", async function () {
-    // TODO: what are the valid statuses? !none, !ready results in this case
     fetch.onCall(0).resolves(f({ status: "building", diff: diff }));
 
     const [error] = await tryToCatch(() =>