diff --git a/crates/ui2/src/components/avatar.rs b/crates/ui2/src/components/avatar.rs
index 2c2679c39a32423488c87e1274e2395a17217726..ab79352f86ed13f70650d78d2596519b1f85279a 100644
--- a/crates/ui2/src/components/avatar.rs
+++ b/crates/ui2/src/components/avatar.rs
@@ -54,7 +54,7 @@ mod stories {
     impl Render for AvatarStory {
         type Element = Div;
 
-        fn render(&mut self, cx: &mut WindowContext) -> Self::Element {
+        fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)
                 .child(Story::title_for::<Avatar>(cx))
                 .child(Story::label(cx, "Default"))
diff --git a/crates/ui2/src/components/button.rs b/crates/ui2/src/components/button.rs
index c70c6981fa083f0a0a4711670528c618d313d953..3d92cebec55c8a6ee524299b9fcc5cfb4fdb6b5b 100644
--- a/crates/ui2/src/components/button.rs
+++ b/crates/ui2/src/components/button.rs
@@ -251,7 +251,7 @@ mod stories {
             let states = InteractionState::iter();
 
             Story::container(cx)
-                .child(Story::title_for::<_, Button>(cx))
+                .child(Story::title_for::<Button>(cx))
                 .child(
                     div()
                         .flex()
@@ -394,7 +394,7 @@ mod stories {
                 .child(
                     Button::new("Label")
                         .variant(ButtonVariant::Ghost)
-                        .on_click(cx.callback(|_view, _, cx| println!("Button clicked."))),
+                        .on_click(|_, cx| println!("Button clicked.")),
                 )
         }
     }
diff --git a/crates/ui2/src/components/checkbox.rs b/crates/ui2/src/components/checkbox.rs
index 276ee3a795d7635b71db9b8e1c3b2f6ccd64181f..f8f54df69f93176de300ddc1138d86455a7896b1 100644
--- a/crates/ui2/src/components/checkbox.rs
+++ b/crates/ui2/src/components/checkbox.rs
@@ -291,7 +291,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{h_stack, Story};
-    use gpui::{Div, Render};
+    use gpui::{Div, Render, ViewContext};
 
     pub struct CheckboxStory;
 
@@ -300,7 +300,7 @@ mod stories {
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)
-                .child(Story::title_for::<_, Checkbox<Self>>(cx))
+                .child(Story::title_for::<Checkbox>(cx))
                 .child(Story::label(cx, "Default"))
                 .child(
                     h_stack()
diff --git a/crates/ui2/src/components/context_menu.rs b/crates/ui2/src/components/context_menu.rs
index f0424f0cf717e673719bb9e05ce2cb6666509664..a6750be6074647102624a5baf46106ca34072012 100644
--- a/crates/ui2/src/components/context_menu.rs
+++ b/crates/ui2/src/components/context_menu.rs
@@ -309,10 +309,7 @@ mod stories {
 
     actions!(PrintCurrentDate, PrintBestFood);
 
-    fn build_menu<V: Render>(
-        cx: &mut WindowContext,
-        header: impl Into<SharedString>,
-    ) -> View<ContextMenu> {
+    fn build_menu(cx: &mut WindowContext, header: impl Into<SharedString>) -> View<ContextMenu> {
         ContextMenu::build(cx, |menu, _| {
             menu.header(header)
                 .separator()
@@ -337,13 +334,13 @@ mod stories {
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)
-                .on_action(|_, _: &PrintCurrentDate, _| {
+                .on_action(|_: &PrintCurrentDate, _| {
                     println!("printing unix time!");
                     if let Ok(unix_time) = std::time::UNIX_EPOCH.elapsed() {
                         println!("Current Unix time is {:?}", unix_time.as_secs());
                     }
                 })
-                .on_action(|_, _: &PrintBestFood, _| {
+                .on_action(|_: &PrintBestFood, _| {
                     println!("burrito");
                 })
                 .flex()
@@ -363,7 +360,7 @@ mod stories {
                                         "RIGHT CLICK ME"
                                     })
                                 })
-                                .menu(move |_, cx| build_menu(cx, "top left")),
+                                .menu(move |cx| build_menu(cx, "top left")),
                         )
                         .child(
                             menu_handle("test1")
@@ -376,7 +373,7 @@ mod stories {
                                 })
                                 .anchor(AnchorCorner::BottomLeft)
                                 .attach(AnchorCorner::TopLeft)
-                                .menu(move |_, cx| build_menu(cx, "bottom left")),
+                                .menu(move |cx| build_menu(cx, "bottom left")),
                         ),
                 )
                 .child(
@@ -394,7 +391,7 @@ mod stories {
                                     })
                                 })
                                 .anchor(AnchorCorner::TopRight)
-                                .menu(move |_, cx| build_menu(cx, "top right")),
+                                .menu(move |cx| build_menu(cx, "top right")),
                         )
                         .child(
                             menu_handle("test4")
@@ -407,7 +404,7 @@ mod stories {
                                 })
                                 .anchor(AnchorCorner::BottomRight)
                                 .attach(AnchorCorner::TopRight)
-                                .menu(move |_, cx| build_menu(cx, "bottom right")),
+                                .menu(move |cx| build_menu(cx, "bottom right")),
                         ),
                 )
         }
diff --git a/crates/ui2/src/components/details.rs b/crates/ui2/src/components/details.rs
index 66aa586a7788dcf0f3df0045b5eb20615dcacbe5..fbdf34389de807c6f1515e6a5c94483054adc44b 100644
--- a/crates/ui2/src/components/details.rs
+++ b/crates/ui2/src/components/details.rs
@@ -61,7 +61,7 @@ mod stories {
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)
-                .child(Story::title_for::<_, Details<Self>>(cx))
+                .child(Story::title_for::<Details>(cx))
                 .child(Story::label(cx, "Default"))
                 .child(Details::new("The quick brown fox jumps over the lazy dog"))
                 .child(Story::label(cx, "With meta"))
diff --git a/crates/ui2/src/components/facepile.rs b/crates/ui2/src/components/facepile.rs
index 92854e01ce9e902df5258ee96aca18c99c96f91d..5561944049659995567771ad180e224e2f849e3c 100644
--- a/crates/ui2/src/components/facepile.rs
+++ b/crates/ui2/src/components/facepile.rs
@@ -31,34 +31,3 @@ impl Facepile {
 }
 
 use gpui::{Div, RenderOnce};
-#[cfg(feature = "stories")]
-pub use stories::*;
-
-#[cfg(feature = "stories")]
-mod stories {
-    use super::*;
-    use crate::{static_players, Story};
-    use gpui::{Div, Render};
-
-    pub struct FacepileStory;
-
-    impl Render for FacepileStory {
-        type Element = Div;
-
-        fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
-            let players = static_players();
-
-            Story::container(cx)
-                .child(Story::title_for::<_, Facepile>(cx))
-                .child(Story::label(cx, "Default"))
-                .child(
-                    div()
-                        .flex()
-                        .gap_3()
-                        .child(Facepile::new(players.clone().into_iter().take(1)))
-                        .child(Facepile::new(players.clone().into_iter().take(2)))
-                        .child(Facepile::new(players.clone().into_iter().take(3))),
-                )
-        }
-    }
-}
diff --git a/crates/ui2/src/components/icon.rs b/crates/ui2/src/components/icon.rs
index 25b29f379b7c900b555c330dd4d561427a9f6d2f..e5e77e3f08c3618ca22d938d311ea1e3388fa96a 100644
--- a/crates/ui2/src/components/icon.rs
+++ b/crates/ui2/src/components/icon.rs
@@ -219,7 +219,7 @@ mod stories {
             let icons = Icon::iter();
 
             Story::container(cx)
-                .child(Story::title_for::<_, IconElement>(cx))
+                .child(Story::title_for::<IconElement>(cx))
                 .child(Story::label(cx, "All Icons"))
                 .child(div().flex().gap_3().children(icons.map(IconElement::new)))
         }
diff --git a/crates/ui2/src/components/input.rs b/crates/ui2/src/components/input.rs
index 3a72b9e3cc2121ded084e728badc119890803a0a..ceaacde18f81a14c39aacb5a8bd793a64023eed4 100644
--- a/crates/ui2/src/components/input.rs
+++ b/crates/ui2/src/components/input.rs
@@ -123,7 +123,7 @@ mod stories {
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)
-                .child(Story::title_for::<_, Input>(cx))
+                .child(Story::title_for::<Input>(cx))
                 .child(Story::label(cx, "Default"))
                 .child(div().flex().child(Input::new("Search")))
         }
diff --git a/crates/ui2/src/components/keybinding.rs b/crates/ui2/src/components/keybinding.rs
index ffd7094c3ca4bc49aad057490c694baea13725d3..e5faaac640496e71d9ef36202484a62ed97b93de 100644
--- a/crates/ui2/src/components/keybinding.rs
+++ b/crates/ui2/src/components/keybinding.rs
@@ -96,7 +96,7 @@ mod stories {
                 ["ctrl", "alt", "cmd", "shift"].into_iter().permutations(2);
 
             Story::container(cx)
-                .child(Story::title_for::<_, KeyBinding>(cx))
+                .child(Story::title_for::<KeyBinding>(cx))
                 .child(Story::label(cx, "Single Key"))
                 .child(KeyBinding::new(binding("Z")))
                 .child(Story::label(cx, "Single Key with Modifier"))
diff --git a/crates/ui2/src/components/label.rs b/crates/ui2/src/components/label.rs
index 6f343191e5bf20367b1976457fe17f8914d8e1fd..65e25715ee5d9740a49ff27f0a78287c89139345 100644
--- a/crates/ui2/src/components/label.rs
+++ b/crates/ui2/src/components/label.rs
@@ -247,7 +247,7 @@ mod stories {
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)
-                .child(Story::title_for::<_, Label>(cx))
+                .child(Story::title_for::<Label>(cx))
                 .child(Story::label(cx, "Default"))
                 .child(Label::new("Hello, world!"))
                 .child(Story::label(cx, "Highlighted"))
diff --git a/crates/ui2/src/components/palette.rs b/crates/ui2/src/components/palette.rs
index 504c4926565eb9936042b70d21f4710b7e1c9c51..c154215dfe13a25ee5d09bdaf840735f44035079 100644
--- a/crates/ui2/src/components/palette.rs
+++ b/crates/ui2/src/components/palette.rs
@@ -178,7 +178,7 @@ mod stories {
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             {
                 Story::container(cx)
-                    .child(Story::title_for::<_, Palette>(cx))
+                    .child(Story::title_for::<Palette>(cx))
                     .child(Story::label(cx, "Default"))
                     .child(Palette::new("palette-1"))
                     .child(Story::label(cx, "With Items"))
diff --git a/crates/ui2/src/components/panel.rs b/crates/ui2/src/components/panel.rs
index 4918d0df95f471369b28b0a07a7cd47a7d87182a..12a40c78d0f305655f64a1224a23fa6061d3c4ab 100644
--- a/crates/ui2/src/components/panel.rs
+++ b/crates/ui2/src/components/panel.rs
@@ -137,7 +137,7 @@ mod stories {
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)
-                .child(Story::title_for::<Panel<Self>>(cx))
+                .child(Story::title_for::<Panel>(cx))
                 .child(Story::label(cx, "Default"))
                 .child(
                     Panel::new("panel", cx).child(
diff --git a/crates/ui2/src/components/toast.rs b/crates/ui2/src/components/toast.rs
index 1af64eea6de4bfacf04d295d26b6a841deed5de1..cdf29e8c1bed3c856bd81fe617d08fe9cd32bd93 100644
--- a/crates/ui2/src/components/toast.rs
+++ b/crates/ui2/src/components/toast.rs
@@ -109,7 +109,7 @@ mod stories {
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)
-                .child(Story::title_for::<Toast<Self>>(cx))
+                .child(Story::title_for::<Toast>(cx))
                 .child(Story::label(cx, "Default"))
                 .child(Toast::new(ToastOrigin::Bottom).child(Label::new("label")))
         }
diff --git a/crates/ui2/src/story.rs b/crates/ui2/src/story.rs
index a8f6a12402e2bae6554bfbe67702a0a5bba175a2..fc8c42eff7485d52b68687d7a68892a08dc87afe 100644
--- a/crates/ui2/src/story.rs
+++ b/crates/ui2/src/story.rs
@@ -15,10 +15,7 @@ impl Story {
             .bg(cx.theme().colors().background)
     }
 
-    pub fn title<V: 'static>(
-        cx: &mut WindowContext,
-        title: impl Into<SharedString>,
-    ) -> impl Element {
+    pub fn title(cx: &mut WindowContext, title: impl Into<SharedString>) -> impl Element {
         div()
             .text_xl()
             .text_color(cx.theme().colors().text)
@@ -29,10 +26,7 @@ impl Story {
         Self::title(cx, std::any::type_name::<T>())
     }
 
-    pub fn label<V: 'static>(
-        cx: &mut WindowContext,
-        label: impl Into<SharedString>,
-    ) -> impl Element {
+    pub fn label(cx: &mut WindowContext, label: impl Into<SharedString>) -> impl Element {
         div()
             .mt_4()
             .mb_2()