diff --git a/src/game.rs b/src/game.rs
index 7d32fdb..180d565 100644
--- a/src/game.rs
+++ b/src/game.rs
@@ -24,8 +24,7 @@ use crate::systems::{
 use crate::texture::animated::AnimatedTexture;
 use bevy_ecs::event::EventRegistry;
 use bevy_ecs::observer::Trigger;
-use bevy_ecs::prelude::SystemSet;
-use bevy_ecs::schedule::{IntoScheduleConfigs, Schedule};
+use bevy_ecs::schedule::{IntoScheduleConfigs, Schedule, SystemSet};
 use bevy_ecs::system::{NonSendMut, Res, ResMut};
 use bevy_ecs::world::World;
 use sdl2::image::LoadTexture;
diff --git a/src/systems/debug.rs b/src/systems/debug.rs
index 74b273b..2b95c70 100644
--- a/src/systems/debug.rs
+++ b/src/systems/debug.rs
@@ -4,7 +4,8 @@ use std::cmp::Ordering;
 use crate::constants::BOARD_PIXEL_OFFSET;
 use crate::map::builder::Map;
 use crate::systems::{BackbufferResource, Collider, CursorPosition, Position, SystemTimings};
-use bevy_ecs::prelude::*;
+use bevy_ecs::resource::Resource;
+use bevy_ecs::system::{NonSendMut, Query, Res};
 use glam::{IVec2, UVec2, Vec2};
 use sdl2::pixels::Color;
 use sdl2::rect::{Point, Rect};
diff --git a/src/systems/item.rs b/src/systems/item.rs
index 126142f..0897e23 100644
--- a/src/systems/item.rs
+++ b/src/systems/item.rs
@@ -1,4 +1,9 @@
-use bevy_ecs::{event::EventReader, prelude::*, query::With, system::Query};
+use bevy_ecs::{
+    entity::Entity,
+    event::{EventReader, EventWriter},
+    query::With,
+    system::{Commands, Query, Res, ResMut},
+};
 
 use crate::{
     events::GameEvent,
diff --git a/src/systems/player.rs b/src/systems/player.rs
index 774239f..c355a47 100644
--- a/src/systems/player.rs
+++ b/src/systems/player.rs
@@ -1,9 +1,8 @@
 use bevy_ecs::{
     component::Component,
     event::{EventReader, EventWriter},
-    prelude::ResMut,
     query::With,
-    system::{Query, Res},
+    system::{Query, Res, ResMut},
 };
 
 use crate::{
diff --git a/src/systems/profiling.rs b/src/systems/profiling.rs
index 7907e6a..40e912b 100644
--- a/src/systems/profiling.rs
+++ b/src/systems/profiling.rs
@@ -1,5 +1,5 @@
-use bevy_ecs::prelude::Resource;
-use bevy_ecs::system::{IntoSystem, System};
+use bevy_ecs::system::IntoSystem;
+use bevy_ecs::{resource::Resource, system::System};
 use circular_buffer::CircularBuffer;
 use micromap::Map;
 use parking_lot::{Mutex, RwLock};
diff --git a/src/systems/render.rs b/src/systems/render.rs
index 11f60b4..3ea3aca 100644
--- a/src/systems/render.rs
+++ b/src/systems/render.rs
@@ -9,7 +9,8 @@ use crate::texture::sprite::SpriteAtlas;
 use crate::texture::text::TextTexture;
 use bevy_ecs::entity::Entity;
 use bevy_ecs::event::EventWriter;
-use bevy_ecs::prelude::{Changed, Or, RemovedComponents, With, Without};
+use bevy_ecs::query::{Changed, Or, With, Without};
+use bevy_ecs::removal_detection::RemovedComponents;
 use bevy_ecs::resource::Resource;
 use bevy_ecs::system::{NonSendMut, Query, Res, ResMut};
 use sdl2::pixels::Color;
diff --git a/src/systems/stage.rs b/src/systems/stage.rs
index 2fcaa4f..1d86f63 100644
--- a/src/systems/stage.rs
+++ b/src/systems/stage.rs
@@ -1,7 +1,8 @@
 use bevy_ecs::{
-    prelude::{Commands, Entity, Query, With},
+    entity::Entity,
+    query::With,
     resource::Resource,
-    system::ResMut,
+    system::{Commands, Query, ResMut},
 };
 
 use crate::systems::{Frozen, GhostCollider, PlayerControlled};
@@ -36,16 +37,6 @@ impl StartupSequence {
         }
     }
 
-    /// Returns true if the timer is still active (not in GameActive state)
-    pub fn is_active(&self) -> bool {
-        !matches!(self, StartupSequence::GameActive)
-    }
-
-    /// Returns true if we're in the game active stage
-    pub fn is_game_active(&self) -> bool {
-        matches!(self, StartupSequence::GameActive)
-    }
-
     /// Ticks the timer by one frame, returning transition information if state changes
     pub fn tick(&mut self) -> Option<(StartupSequence, StartupSequence)> {
         match self {
diff --git a/tests/collision.rs b/tests/collision.rs
index 3e9a617..64c912b 100644
--- a/tests/collision.rs
+++ b/tests/collision.rs
@@ -1,4 +1,4 @@
-use bevy_ecs::{event::Events, prelude::*, system::RunSystemOnce, world::World};
+use bevy_ecs::{entity::Entity, event::Events, system::RunSystemOnce, world::World};
 
 use pacman::{
     error::GameError,
diff --git a/tests/item.rs b/tests/item.rs
index fa66481..963d50b 100644
--- a/tests/item.rs
+++ b/tests/item.rs
@@ -1,4 +1,4 @@
-use bevy_ecs::{event::Events, prelude::*, system::RunSystemOnce, world::World};
+use bevy_ecs::{entity::Entity, event::Events, system::RunSystemOnce, world::World};
 
 use pacman::{
     events::GameEvent,
diff --git a/tests/player.rs b/tests/player.rs
index 018b465..894d049 100644
--- a/tests/player.rs
+++ b/tests/player.rs
@@ -1,4 +1,4 @@
-use bevy_ecs::{event::Events, prelude::*, system::RunSystemOnce, world::World};
+use bevy_ecs::{entity::Entity, event::Events, system::RunSystemOnce, world::World};
 
 use pacman::{
     events::{GameCommand, GameEvent},