diff --git a/crates/engine/src/tools.rs b/crates/engine/src/tools.rs
index 97a4cfb4..9c0dcabc 100644
--- a/crates/engine/src/tools.rs
+++ b/crates/engine/src/tools.rs
@@ -1025,7 +1025,9 @@ impl Session {
                 | Hit::LineEnd { id, .. }
                 | Hit::Handle { id, .. }
                 | Hit::Vertex { id, .. }
-                | Hit::Frame { id },
+                | Hit::Frame { id }
+                | Hit::TableColumn { id, .. }
+                | Hit::TableRow { id, .. },
             ) => Some(*id),
             None => None,
         };
diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs
index 3c504f3d..33553a83 100644
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@ -612,17 +612,6 @@ fn overlays(app: &mut SlideApp, ui: &Ui, painter: &egui::Painter, xf: Xf, t: &To
         let pts = [Point::new(cr.x0, cr.y0), Point::new(cr.x1, cr.y0), Point::new(cr.x1, cr.y1), Point::new(cr.x0, cr.y1)]
             .map(|q| xf.to_screen(f.affine * q));
         poly(painter, pts, Stroke::new(2.0, t.accent));
-        // The composition is in the cell text; underline it where that text is drawn (#101).
-        for (a, b, thick) in deckcraft_engine::cmd::text::composition_underlines(st) {
-            painter.line_segment([xf.to_screen(a), xf.to_screen(b)], Stroke::new(if thick { 2.0 } else { 1.0 }, t.caret));
-        }
-        if !ts.is_range() {
-            let blink = (ui.input(|i| i.time) * 1.6).fract() < 0.6;
-            ui.ctx().request_repaint_after(std::time::Duration::from_millis(300));
-            if blink && let Some((top, bot)) = deckcraft_engine::cmd::text::caret_line(st, ts) {
-                painter.line_segment([xf.to_screen(top), xf.to_screen(bot)], Stroke::new(1.5, t.caret));
-            }
-        }
     }
     // Smart guides, marquee, previews.
     for g in &app.session.tool.guides {