diff --git a/examples/2d/mesh2d_manual.rs b/examples/2d/mesh2d_manual.rs
index 665c584c41..bf9850f68d 100644
--- a/examples/2d/mesh2d_manual.rs
+++ b/examples/2d/mesh2d_manual.rs
@@ -275,8 +275,8 @@ impl Plugin for ColoredMesh2dPlugin {
         );
 
         // Register our custom draw function and pipeline, and add our render systems
-        let render_app = app.get_sub_app_mut(RenderApp).unwrap();
-        render_app
+        app.get_sub_app_mut(RenderApp)
+            .unwrap()
             .add_render_command::<Transparent2d, DrawColoredMesh2d>()
             .init_resource::<ColoredMesh2dPipeline>()
             .init_resource::<SpecializedRenderPipelines<ColoredMesh2dPipeline>>()
diff --git a/examples/input/mouse_grab.rs b/examples/input/mouse_grab.rs
index 7662814e27..ecf22f2823 100644
--- a/examples/input/mouse_grab.rs
+++ b/examples/input/mouse_grab.rs
@@ -16,7 +16,7 @@ fn grab_mouse(
     mouse: Res<Input<MouseButton>>,
     key: Res<Input<KeyCode>>,
 ) {
-    let window = windows.get_primary_mut().unwrap();
+    let window = windows.primary_mut();
     if mouse.just_pressed(MouseButton::Left) {
         window.set_cursor_visibility(false);
         window.set_cursor_lock_mode(true);
diff --git a/examples/shader/compute_shader_game_of_life.rs b/examples/shader/compute_shader_game_of_life.rs
index 26cce5e36e..aff074fd28 100644
--- a/examples/shader/compute_shader_game_of_life.rs
+++ b/examples/shader/compute_shader_game_of_life.rs
@@ -13,7 +13,6 @@ use bevy::{
         renderer::{RenderContext, RenderDevice},
         RenderApp, RenderStage,
     },
-    window::WindowDescriptor,
 };
 use std::borrow::Cow;
 
diff --git a/examples/stress_tests/many_buttons.rs b/examples/stress_tests/many_buttons.rs
index 2bbd3d2c45..74a3d6b37d 100644
--- a/examples/stress_tests/many_buttons.rs
+++ b/examples/stress_tests/many_buttons.rs
@@ -47,7 +47,7 @@ struct UiFont(Handle<Font>);
 
 impl FromWorld for UiFont {
     fn from_world(world: &mut World) -> Self {
-        let asset_server = world.get_resource::<AssetServer>().unwrap();
+        let asset_server = world.resource::<AssetServer>();
         UiFont(asset_server.load("fonts/FiraSans-Bold.ttf"))
     }
 }
diff --git a/examples/window/transparent_window.rs b/examples/window/transparent_window.rs
index 1685956bc1..b229b05092 100644
--- a/examples/window/transparent_window.rs
+++ b/examples/window/transparent_window.rs
@@ -4,7 +4,7 @@
 //! [documentation](https://docs.rs/bevy/latest/bevy/prelude/struct.WindowDescriptor.html#structfield.transparent)
 //! for more details.
 
-use bevy::{prelude::*, window::WindowDescriptor};
+use bevy::prelude::*;
 
 fn main() {
     App::new()
diff --git a/examples/window/window_resizing.rs b/examples/window/window_resizing.rs
index ceffac5901..03e5130d40 100644
--- a/examples/window/window_resizing.rs
+++ b/examples/window/window_resizing.rs
@@ -65,7 +65,7 @@ fn toggle_resolution(
     mut windows: ResMut<Windows>,
     resolution: Res<ResolutionSettings>,
 ) {
-    let window = windows.get_primary_mut().unwrap();
+    let window = windows.primary_mut();
 
     if keys.just_pressed(KeyCode::Key1) {
         let res = resolution.small;
@@ -87,7 +87,7 @@ fn on_resize_system(
     mut q: Query<&mut Text, With<ResolutionText>>,
     mut resize_reader: EventReader<WindowResized>,
 ) {
-    let mut text = q.get_single_mut().unwrap();
+    let mut text = q.single_mut();
     for e in resize_reader.iter() {
         // When resolution is being changed
         text.sections[0].value = format!("{:.1} x {:.1}", e.width, e.height);
diff --git a/examples/window/window_settings.rs b/examples/window/window_settings.rs
index c06153ce15..987a22e131 100644
--- a/examples/window/window_settings.rs
+++ b/examples/window/window_settings.rs
@@ -1,8 +1,11 @@
 //! Illustrates how to change window settings and shows how to affect
 //! the mouse pointer in various ways.
 
-use bevy::{prelude::*, window::PresentMode};
-use bevy_internal::diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin};
+use bevy::{
+    diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
+    prelude::*,
+    window::PresentMode,
+};
 
 fn main() {
     App::new()
diff --git a/tests/window/minimising.rs b/tests/window/minimising.rs
index 107dc4fa37..f7198fd187 100644
--- a/tests/window/minimising.rs
+++ b/tests/window/minimising.rs
@@ -19,7 +19,7 @@ fn main() {
 
 fn minimise_automatically(mut windows: ResMut<Windows>, mut frames: Local<u32>) {
     if *frames == 60 {
-        windows.get_primary_mut().unwrap().set_minimized(true);
+        windows.primary_mut().set_minimized(true);
     } else {
         *frames += 1;
     }
diff --git a/tests/window/resizing.rs b/tests/window/resizing.rs
index d0a0182710..24824e0ed0 100644
--- a/tests/window/resizing.rs
+++ b/tests/window/resizing.rs
@@ -98,7 +98,7 @@ fn change_window_size(
 
 fn sync_dimensions(dim: Res<Dimensions>, mut windows: ResMut<Windows>) {
     if dim.is_changed() {
-        windows.get_primary_mut().unwrap().set_resolution(
+        windows.primary_mut().set_resolution(
             dim.width.try_into().unwrap(),
             dim.height.try_into().unwrap(),
         );