diff --git a/Cargo.toml b/Cargo.toml
index ccf0126d39f95..4c417d9eb70af 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1352,17 +1352,6 @@ description = "Illustrates how to use States to control transitioning from a Men
 category = "ECS (Entity Component System)"
 wasm = false
 
-[[example]]
-name = "advanced_state"
-path = "examples/ecs/advanced_state.rs"
-doc-scrape-examples = true
-
-[package.metadata.example.advanced_state]
-name = "Advanced State"
-description = "Illustrates use of some of the more advanced state concepts, such as `StateMatchers`."
-category = "ECS (Entity Component System)"
-wasm = false
-
 [[example]]
 name = "system_piping"
 path = "examples/ecs/system_piping.rs"
diff --git a/examples/README.md b/examples/README.md
index 9223a878a5f6f..4aec9498546ba 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -213,7 +213,6 @@ Example | Description
 
 Example | Description
 --- | ---
-[Advanced State](../examples/ecs/advanced_state.rs) | Illustrates use of some of the more advanced state concepts, such as `StateMatchers`.
 [Apply System Buffers](../examples/ecs/apply_deferred.rs) | Show how to use `apply_deferred` system
 [Component Change Detection](../examples/ecs/component_change_detection.rs) | Change detection on components
 [Custom Query Parameters](../examples/ecs/custom_query_param.rs) | Groups commonly used compound queries and query filters into a single type
diff --git a/examples/ecs/advanced_state.rs b/examples/ecs/advanced_state.rs
deleted file mode 100644
index 1135f762ef987..0000000000000
--- a/examples/ecs/advanced_state.rs
+++ /dev/null
@@ -1,347 +0,0 @@
-//! This example illustrates how to use some of the more advanced [`States`] functionality for high-level app control flow.
-//!
-//! The use case here is identical to the regular [state](./state.rs) example, but we will be
-//! utilizing the `StateMatcher` trait more directly.
-use bevy::prelude::*;
-
-fn main() {
-    App::new()
-        .add_plugins(DefaultPlugins)
-        .add_state::<AppState>()
-        .add_systems(Startup, setup)
-        // When we check whether a state is valid, we use a `StateMatcher`.
-        // In the simple example, we use pattern matching to generate one on the fly
-        // But we can also use pre-defined ones, like `ShowsUI`
-        .add_systems(on_exit_strict!(ShowsUI), cleanup_ui)
-        // In addition, all `States` also implement `StateMatcher`, so you can use them here.
-        // Although there are some optimizations around `OnEnter(S)` and `OnExit(S)` that make
-        // those a better choice in this case.
-        .add_systems(on_enter!(AppState::Menu), setup_menu)
-        // A state matcher can even be an enum! or really anything with that implements
-        // the state matcher trait (see below).
-        .add_systems(on_enter!(InGame::Paused), setup_paused)
-        .add_systems(on_enter!(InGame::Running), setup_in_game_ui)
-        // And unlike a regular state, the values are not mutually exclusive.
-        // So this will be valid both when the game is paused and when it's not
-        .add_systems(on_enter!(InGame::Any), setup_game)
-        // And all the same things apply with the `in_state!` macro
-        .add_systems(Update, menu.run_if(in_state!(AppState::Menu)))
-        .add_systems(Update, change_color.run_if(in_state!(InGame::Any)))
-        .add_systems(Update, toggle_pause)
-        // And it still works with conditional states as well
-        .add_sub_state::<MovementState, _>(InGame::Running)
-        .add_systems(Update, invert_movement.run_if(in_state!(MovementState, _)))
-        .add_systems(Update, movement.run_if(in_state(MovementState::Normal)))
-        .add_systems(
-            Update,
-            inverted_movement.run_if(in_state(MovementState::Inverted)),
-        )
-        .run();
-}
-
-// The simplest way to define a state matcher is using the `state_matcher!` macro.
-// You pass in the visibility (optionally), name, state type and match expression.
-state_matcher!(pub ShowsUI, AppState, Menu | InGame { .. } );
-
-#[derive(Debug, Eq, PartialEq, Hash, Clone)]
-enum InGame {
-    Any,
-    Running,
-    Paused,
-}
-
-// State Matchers can also be implemented manually
-// This allows for somewhat more complex situations,
-// For example here we can determine if we want to match in
-// any InGame state, only when the game is paused, or only when it
-// is running. You can't have this kind of logic using pure equality,
-// and having it defined this way makes it re-usable and customizable to your needs.
-impl StateMatcher<AppState> for InGame {
-    fn match_state(&self, state: &AppState) -> bool {
-        match state {
-            AppState::InGame { paused } => match self {
-                InGame::Any => true,
-                InGame::Running => !*paused,
-                InGame::Paused => *paused,
-            },
-            _ => false,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
-enum AppState {
-    #[default]
-    Menu,
-    InGame {
-        paused: bool,
-    },
-}
-
-#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
-enum MovementState {
-    #[default]
-    Normal,
-    Inverted,
-}
-
-const NORMAL_BUTTON: Color = Color::rgb(0.15, 0.15, 0.15);
-const HOVERED_BUTTON: Color = Color::rgb(0.25, 0.25, 0.25);
-const PRESSED_BUTTON: Color = Color::rgb(0.35, 0.75, 0.35);
-const LABEL: Color = Color::rgba(0.0, 0.0, 0.0, 0.7);
-
-fn setup(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
-}
-
-fn setup_menu(mut commands: Commands) {
-    commands
-        .spawn(NodeBundle {
-            style: Style {
-                // center button
-                width: Val::Percent(100.),
-                height: Val::Percent(100.),
-                justify_content: JustifyContent::Center,
-                align_items: AlignItems::Center,
-                ..default()
-            },
-            ..default()
-        })
-        .with_children(|parent| {
-            parent
-                .spawn(ButtonBundle {
-                    style: Style {
-                        width: Val::Px(150.),
-                        height: Val::Px(65.),
-                        // horizontally center child text
-                        justify_content: JustifyContent::Center,
-                        // vertically center child text
-                        align_items: AlignItems::Center,
-                        ..default()
-                    },
-                    background_color: NORMAL_BUTTON.into(),
-                    ..default()
-                })
-                .with_children(|parent| {
-                    parent.spawn(TextBundle::from_section(
-                        "Play",
-                        TextStyle {
-                            font_size: 40.0,
-                            color: Color::rgb(0.9, 0.9, 0.9),
-                            ..default()
-                        },
-                    ));
-                });
-        });
-}
-
-fn menu(
-    mut next_state: ResMut<NextState<AppState>>,
-    mut interaction_query: Query<
-        (&Interaction, &mut BackgroundColor),
-        (Changed<Interaction>, With<Button>),
-    >,
-) {
-    for (interaction, mut color) in &mut interaction_query {
-        match *interaction {
-            Interaction::Pressed => {
-                *color = PRESSED_BUTTON.into();
-                // One way to set the next state is to set the full state value, like so
-                next_state.set(AppState::InGame { paused: true });
-            }
-            Interaction::Hovered => {
-                *color = HOVERED_BUTTON.into();
-            }
-            Interaction::None => {
-                *color = NORMAL_BUTTON.into();
-            }
-        }
-    }
-}
-
-fn setup_game(mut commands: Commands, asset_server: Res<AssetServer>) {
-    commands.spawn(SpriteBundle {
-        texture: asset_server.load("branding/icon.png"),
-        ..default()
-    });
-}
-
-const SPEED: f32 = 100.0;
-fn movement(
-    time: Res<Time>,
-    input: Res<Input<KeyCode>>,
-    mut query: Query<&mut Transform, With<Sprite>>,
-) {
-    for mut transform in &mut query {
-        let mut direction = Vec3::ZERO;
-        if input.pressed(KeyCode::Left) {
-            direction.x -= 1.0;
-        }
-        if input.pressed(KeyCode::Right) {
-            direction.x += 1.0;
-        }
-        if input.pressed(KeyCode::Up) {
-            direction.y += 1.0;
-        }
-        if input.pressed(KeyCode::Down) {
-            direction.y -= 1.0;
-        }
-
-        if direction != Vec3::ZERO {
-            transform.translation += direction.normalize() * SPEED * time.delta_seconds();
-        }
-    }
-}
-
-fn inverted_movement(
-    time: Res<Time>,
-    input: Res<Input<KeyCode>>,
-    mut query: Query<&mut Transform, With<Sprite>>,
-) {
-    for mut transform in &mut query {
-        let mut direction = Vec3::ZERO;
-        if input.pressed(KeyCode::Left) {
-            direction.x += 1.0;
-        }
-        if input.pressed(KeyCode::Right) {
-            direction.x -= 1.0;
-        }
-        if input.pressed(KeyCode::Up) {
-            direction.y -= 1.0;
-        }
-        if input.pressed(KeyCode::Down) {
-            direction.y += 1.0;
-        }
-
-        if direction != Vec3::ZERO {
-            transform.translation += direction.normalize() * SPEED * time.delta_seconds();
-        }
-    }
-}
-
-fn change_color(time: Res<Time>, mut query: Query<&mut Sprite>) {
-    for mut sprite in &mut query {
-        sprite
-            .color
-            .set_b((time.elapsed_seconds() * 0.5).sin() + 2.0);
-    }
-}
-
-fn toggle_pause(input: Res<Input<KeyCode>>, mut next_state: ResMut<NextState<AppState>>) {
-    if input.just_pressed(KeyCode::Escape) {
-        // Alternatively, you provide next_state with a setter function, which will take the current state, and output the new state, allowing for some degree of update-in-place
-        next_state.setter(|state| match &state {
-            AppState::InGame { paused } => AppState::InGame { paused: !paused },
-            _ => state,
-        });
-    }
-}
-
-fn invert_movement(input: Res<Input<KeyCode>>, mut next_state: ResMut<NextState<MovementState>>) {
-    if input.just_pressed(KeyCode::ShiftLeft) {
-        next_state.set(MovementState::Inverted);
-    }
-    if input.just_released(KeyCode::ShiftLeft) {
-        next_state.set(MovementState::Normal);
-    }
-}
-
-fn setup_paused(mut commands: Commands) {
-    commands
-        .spawn(NodeBundle {
-            style: Style {
-                // center button
-                width: Val::Percent(100.),
-                height: Val::Percent(100.),
-                justify_content: JustifyContent::Center,
-                align_items: AlignItems::Center,
-                ..default()
-            },
-            ..default()
-        })
-        .with_children(|parent| {
-            parent
-                .spawn(NodeBundle {
-                    style: Style {
-                        width: Val::Auto,
-                        height: Val::Auto,
-                        padding: UiRect::all(Val::Px(10.)),
-                        // horizontally center child text
-                        justify_content: JustifyContent::Center,
-                        // vertically center child text
-                        align_items: AlignItems::Center,
-                        ..default()
-                    },
-                    background_color: LABEL.into(),
-                    ..default()
-                })
-                .with_children(|parent| {
-                    parent.spawn(TextBundle::from_section(
-                        "Paused... Press Esc to Resume",
-                        TextStyle {
-                            font_size: 40.0,
-                            color: Color::rgb(0.9, 0.9, 0.9),
-                            ..default()
-                        },
-                    ));
-                });
-        });
-}
-
-fn setup_in_game_ui(mut commands: Commands) {
-    commands
-        .spawn(NodeBundle {
-            style: Style {
-                // center button
-                width: Val::Percent(100.),
-                height: Val::Percent(100.),
-                justify_content: JustifyContent::Start,
-                align_items: AlignItems::Start,
-                flex_direction: FlexDirection::Column,
-                ..default()
-            },
-            ..default()
-        })
-        .with_children(|parent| {
-            parent
-                .spawn(NodeBundle {
-                    style: Style {
-                        width: Val::Auto,
-                        height: Val::Auto,
-                        padding: UiRect::all(Val::Px(10.)),
-                        // horizontally center child text
-                        justify_content: JustifyContent::Center,
-                        // vertically center child text
-                        align_items: AlignItems::Center,
-                        flex_direction: FlexDirection::Column,
-                        ..default()
-                    },
-                    background_color: LABEL.into(),
-                    ..default()
-                })
-                .with_children(|parent| {
-                    parent.spawn(TextBundle::from_section(
-                        "Press Esc to Pause",
-                        TextStyle {
-                            font_size: 25.0,
-                            color: Color::rgb(0.9, 0.9, 0.9),
-                            ..default()
-                        },
-                    ));
-                    parent.spawn(TextBundle::from_section(
-                        "Hold Left Shift to invert movement",
-                        TextStyle {
-                            font_size: 25.0,
-                            color: Color::rgb(0.9, 0.9, 0.9),
-                            ..default()
-                        },
-                    ));
-                });
-        });
-}
-
-fn cleanup_ui(mut commands: Commands, roots: Query<Entity, (With<Node>, Without<Parent>)>) {
-    for root in &roots {
-        commands.entity(root).despawn_recursive();
-    }
-}
diff --git a/examples/ecs/state.rs b/examples/ecs/state.rs
index 9418ce36ea3aa..c1f7ceb2ec552 100644
--- a/examples/ecs/state.rs
+++ b/examples/ecs/state.rs
@@ -20,11 +20,7 @@ fn main() {
         // and then all systems from the enter schedule of the state we're entering are run second.
         .add_systems(OnEnter(AppState::Menu), setup_menu)
         // The `OnEnter` struct can accept any valid state object, not just enums
-        .add_systems(OnEnter(AppState::InGame { paused: true }), setup_paused)
-        .add_systems(
-            OnEnter(AppState::InGame { paused: false }),
-            setup_in_game_ui,
-        )
+        .add_systems(OnEnter(AppState::InGame(GameState::Paused)), setup_paused)
         // In addition to `OnEnter` and `OnExit`, you can run systems any other schedule as well.
         // To do so, you will want to add the `in_state()` run condition, which will check
         // if we're in the correct state every time the schedule runs. In this case - that's every frame.
@@ -32,6 +28,10 @@ fn main() {
         // But that is not all - we can use pattern matching with the `on_enter! macro
         // Which lets us run the system whenever we enter a matching state from one that doesn't maatch
         .add_systems(on_enter!(AppState, InGame { .. }), setup_game)
+        .add_systems(
+            on_enter!(AppState, InGame(GameState::Running(_))),
+            setup_in_game_ui,
+        )
         // Both `on_enter!` and `on_exit` also have `_strict` versions, which will match whenever
         // we enter/exit a matching system regardless if the previous/next system matched as well.
         // As a result, this system will run on every state transition, because every state matches
@@ -44,20 +44,21 @@ fn main() {
             Update,
             change_color.run_if(in_state!(AppState, InGame { .. })),
         )
-        // Lastly, we can also insert sub states to our app.
-        // Sub states are just regular states, but they are set up so that they are automatically
-        // removed from the world when you aren't in a matching parent state, and are added to the world
-        // with their default value whenever you are in a matching parent state.
-        // In this case - `State<MovementState>` will only exist in the world when the game is not paused.
-        .add_sub_state::<MovementState, _>(AppState::InGame { paused: false })
-        // Just like any other state, we can use the various macros and functions to relate to it.
-        // Here we are pattern matching against any value of `MovementState`, which means it will run
-        // whenever `MovementState` exists - which is when we are in an unpaused game.
-        .add_systems(Update, invert_movement.run_if(in_state!(MovementState, _)))
-        .add_systems(Update, movement.run_if(in_state(MovementState::Normal)))
         .add_systems(
             Update,
-            inverted_movement.run_if(in_state(MovementState::Inverted)),
+            invert_movement.run_if(in_state!(AppState, InGame(GameState::Running(_)))),
+        )
+        .add_systems(
+            Update,
+            movement.run_if(in_state(AppState::InGame(GameState::Running(
+                MovementState::Normal,
+            )))),
+        )
+        .add_systems(
+            Update,
+            inverted_movement.run_if(in_state(AppState::InGame(GameState::Running(
+                MovementState::Inverted,
+            )))),
         )
         .run();
 }
@@ -66,12 +67,22 @@ fn main() {
 enum AppState {
     #[default]
     Menu,
-    InGame {
-        paused: bool,
-    },
+    InGame(GameState),
 }
 
-#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
+enum GameState {
+    Running(MovementState),
+    Paused,
+}
+
+impl Default for GameState {
+    fn default() -> Self {
+        GameState::Running(MovementState::Normal)
+    }
+}
+
+#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash)]
 enum MovementState {
     #[default]
     Normal,
@@ -140,7 +151,7 @@ fn menu(
             Interaction::Pressed => {
                 *color = PRESSED_BUTTON.into();
                 // One way to set the next state is to set the full state value, like so
-                next_state.set(AppState::InGame { paused: true });
+                next_state.set(AppState::InGame(GameState::Paused));
             }
             Interaction::Hovered => {
                 *color = HOVERED_BUTTON.into();
@@ -224,18 +235,23 @@ fn toggle_pause(input: Res<Input<KeyCode>>, mut next_state: ResMut<NextState<App
     if input.just_pressed(KeyCode::Escape) {
         // Alternatively, you provide next_state with a setter function, which will take the current state, and output the new state, allowing for some degree of update-in-place
         next_state.setter(|state| match &state {
-            AppState::InGame { paused } => AppState::InGame { paused: !paused },
+            AppState::InGame(state) => AppState::InGame(match state {
+                GameState::Running(_) => GameState::Paused,
+                GameState::Paused => GameState::default(),
+            }),
             _ => state,
         });
     }
 }
 
-fn invert_movement(input: Res<Input<KeyCode>>, mut next_state: ResMut<NextState<MovementState>>) {
+fn invert_movement(input: Res<Input<KeyCode>>, mut next_state: ResMut<NextState<AppState>>) {
     if input.just_pressed(KeyCode::ShiftLeft) {
-        next_state.set(MovementState::Inverted);
+        next_state.set(AppState::InGame(GameState::Running(
+            MovementState::Inverted,
+        )));
     }
     if input.just_released(KeyCode::ShiftLeft) {
-        next_state.set(MovementState::Normal);
+        next_state.set(AppState::InGame(GameState::Running(MovementState::Normal)));
     }
 }