diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index d498f52..4536687 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -435,7 +435,6 @@ impl<'ws> Workspace<'ws> {
                 Ok(None)
             }
             Ok(Some(Cmd::Quit)) => {
-                // TODO(zaphar): We probably need to do better than this
                 Ok(Some(ExitCode::SUCCESS))
             }
             Ok(None) => {
diff --git a/src/ui/render/viewport.rs b/src/ui/render/viewport.rs
index 32de8b6..1b33e9b 100644
--- a/src/ui/render/viewport.rs
+++ b/src/ui/render/viewport.rs
@@ -155,7 +155,6 @@ impl<'ws> Viewport<'ws> {
                     let mut cells = vec![Cell::new(Text::from(ri.to_string()))];
                     cells.extend(visible_columns.iter().map(
                         |VisibleColumn { idx: ci, length: _ }| {
-                            // TODO(zaphar): Is this safe?
                             let content = self
                                 .book
                                 .get_cell_addr_rendered(&Address { row: ri, col: *ci })