diff --git a/src/main.rs b/src/main.rs
index dbabcec..9b99d3e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,6 +16,7 @@
 
 // TODO Enable warn(unreachable_pub)?
 // TODO Clean up use and manipulation of toss Pos and Size
+// TODO Remove unnecessary Debug impls and compare compile times
 
 mod config;
 mod euph;
diff --git a/src/ui.rs b/src/ui.rs
index 24e133a..ebe09d1 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,3 +1,5 @@
+// TODO Reduce need to pass Terminal when only width db is needed
+
 mod chat;
 mod euph;
 mod input;
diff --git a/src/ui/euph/room.rs b/src/ui/euph/room.rs
index 4d0d57a..656a13f 100644
--- a/src/ui/euph/room.rs
+++ b/src/ui/euph/room.rs
@@ -264,7 +264,6 @@ impl EuphRoom {
     }
 
     async fn status_widget(&self, status: &RoomStatus) -> BoxedWidget {
-        // TODO Include unread message count
         let room = self.chat.store().room();
         let room_style = ContentStyle::default().bold().blue();
         let mut info = Styled::new(format!("&{room}"), room_style);