diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 81974a67b0..e6cf78bc5d 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -39004,8 +39004,8 @@ var TextSecureServer = (function() {
                 };
             }
 
-            //TODO: This is just to make the server happy (v2 clients should choke on publicKey),
-            // it needs removed before release
+            // This is just to make the server happy
+            // (v2 clients should choke on publicKey)
             keys.lastResortKey = {keyId: 0x7fffFFFF, publicKey: btoa("42")};
 
             return this.ajax({
@@ -39037,9 +39037,6 @@ var TextSecureServer = (function() {
                     res.devices[i].signedPreKey.publicKey = StringView.base64ToBytes(res.devices[i].signedPreKey.publicKey);
                     res.devices[i].signedPreKey.signature = StringView.base64ToBytes(res.devices[i].signedPreKey.signature);
                     res.devices[i].preKey.publicKey = StringView.base64ToBytes(res.devices[i].preKey.publicKey);
-                    //TODO: Is this still needed?
-                    //if (res.devices[i].keyId === undefined)
-                    //  res.devices[i].keyId = 0;
                 }
                 return res;
             });
diff --git a/libtextsecure/api.js b/libtextsecure/api.js
index 8b4a137f98..88dbe76d29 100644
--- a/libtextsecure/api.js
+++ b/libtextsecure/api.js
@@ -209,8 +209,8 @@ var TextSecureServer = (function() {
                 };
             }
 
-            //TODO: This is just to make the server happy (v2 clients should choke on publicKey),
-            // it needs removed before release
+            // This is just to make the server happy
+            // (v2 clients should choke on publicKey)
             keys.lastResortKey = {keyId: 0x7fffFFFF, publicKey: btoa("42")};
 
             return this.ajax({
@@ -242,9 +242,6 @@ var TextSecureServer = (function() {
                     res.devices[i].signedPreKey.publicKey = StringView.base64ToBytes(res.devices[i].signedPreKey.publicKey);
                     res.devices[i].signedPreKey.signature = StringView.base64ToBytes(res.devices[i].signedPreKey.signature);
                     res.devices[i].preKey.publicKey = StringView.base64ToBytes(res.devices[i].preKey.publicKey);
-                    //TODO: Is this still needed?
-                    //if (res.devices[i].keyId === undefined)
-                    //  res.devices[i].keyId = 0;
                 }
                 return res;
             });