diff --git a/Cargo.lock b/Cargo.lock
index 7b8d1e1..38ed839 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -924,6 +924,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
 dependencies = [
  "pin-project-lite",
+ "tokio-macros",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -1110,4 +1122,5 @@ dependencies = [
  "gtk4",
  "libadwaita",
  "relm4",
+ "tokio",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index b384d38..7542561 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,4 +17,7 @@ glib-build-tools = "0.21.0"
 async-sqlite = { version = "0.5.4", default-features = false }
 gtk4 = { version = "0.10.3", features = ["v4_20"] }
 libadwaita = { version = "0.8.1", features = ["v1_8"] }
-relm4 = { version = "0.10.1", features = ["gnome_48", "libadwaita"] }
+relm4 = { version = "0.10.1", features = ["gnome_48"] }
+# Tokio as included in Relm4 doesn't have the macros feature enabled.
+# Keep version in sync with the one Relm4 uses.
+tokio = { version = "1.47.3", features = ["macros", "rt", "rt-multi-thread", "sync"] }
diff --git a/src/ui/components/media_grid/film_grid.rs b/src/ui/components/media_grid/film_grid.rs
index 0d79ccb..de8d08b 100644
--- a/src/ui/components/media_grid/film_grid.rs
+++ b/src/ui/components/media_grid/film_grid.rs
@@ -40,9 +40,6 @@ impl Component for FilmGrid {
       set_propagate_natural_height: true,
 
       #[name="grid"]
-      // TODO: Replace this with a GridView.
-      // Once this is done we can replace the factory with a TypedGridView for better performance
-      // (i.e. lazy item rendering) if needed. This should also enable less cursed sorting.
       FlowBox {
         set_orientation: Orientation::Horizontal,
         set_homogeneous: true,
diff --git a/src/ui/components/media_grid/series_grid.rs b/src/ui/components/media_grid/series_grid.rs
index 7dcfb61..6401ecc 100644
--- a/src/ui/components/media_grid/series_grid.rs
+++ b/src/ui/components/media_grid/series_grid.rs
@@ -40,9 +40,6 @@ impl Component for SeriesGrid {
       set_propagate_natural_height: true,
 
       #[name="grid"]
-      // TODO: Replace this with a GridView.
-      // Once this is done we can replace the factory with a TypedGridView for better performance
-      // (i.e. lazy item rendering) if needed. This should also enable less cursed sorting.
       FlowBox {
         set_orientation: Orientation::Horizontal,
         set_homogeneous: true,