diff --git a/matrix_appservice_kakaotalk/portal.py b/matrix_appservice_kakaotalk/portal.py
index ced6dee..b71d0aa 100644
--- a/matrix_appservice_kakaotalk/portal.py
+++ b/matrix_appservice_kakaotalk/portal.py
@@ -1881,7 +1881,7 @@ class Portal(DBPortal, BasePortal):
         if not self.is_direct:
             self._main_intent = self.az.intent
         else:
-            # TODO Save kt_sender in DB instead? Depends on if DM channels are shared...
+            # TODO Save kt_sender in DB instead? Only do that if keeping a unique DM portal for each receiver
             user = await u.User.get_by_ktid(self.kt_receiver)
             assert user, f"Found no user for this portal's receiver of {self.kt_receiver}"
             if self.kt_type == KnownChannelType.MemoChat:
@@ -1920,7 +1920,7 @@ class Portal(DBPortal, BasePortal):
         create: bool = True,
         kt_type: ChannelType | None = None,
     ) -> Portal | None:
-        # TODO Find out if direct channels are shared. If so, don't need kt_receiver!
+        # TODO Direct chats are shared, so can remove kt_receiver if DM portals should be shared
         if kt_type:
             kt_receiver = kt_receiver if KnownChannelType.is_direct(kt_type) else 0
         ktid_full = (ktid, kt_receiver)
diff --git a/matrix_appservice_kakaotalk/user.py b/matrix_appservice_kakaotalk/user.py
index dbe9b8a..cd60d10 100644
--- a/matrix_appservice_kakaotalk/user.py
+++ b/matrix_appservice_kakaotalk/user.py
@@ -434,7 +434,6 @@ class User(DBUser, BaseUser):
 
     async def logout(self, *, remove_ktid: bool = True, reset_device: bool = False) -> None:
         if self._client:
-            # TODO Look for a logout API call
             await self._client.stop()
         if remove_ktid:
             await self.push_bridge_state(BridgeStateEvent.LOGGED_OUT)
diff --git a/node/src/client.js b/node/src/client.js
index e2f7ee2..d7da8f4 100644
--- a/node/src/client.js
+++ b/node/src/client.js
@@ -527,7 +527,6 @@ export default class PeerClient {
 	 * request failed, its status is stored here.
 	 */
 	handleLogin = async (req) => {
-		// TODO Look for a logout API call
 		const authClient = await this.#createAuthClient(req.uuid)
 		const loginRes = await authClient.login(req.form, req.forced)
 		if (loginRes.status === KnownAuthStatusCode.DEVICE_NOT_REGISTERED) {