diff --git a/src/components.rs b/src/components.rs
index 24eacdf..5943aff 100644
--- a/src/components.rs
+++ b/src/components.rs
@@ -187,5 +187,5 @@ pub struct SerializeMe;
 // Special component that exists to help serialize the game data
 #[derive(Component, Serialize, Deserialize, Clone)]
 pub struct SerializationHelper {
-    pub map: super::map::Map,
+    pub map: crate::map::Map,
 }
diff --git a/src/inventory_system.rs b/src/inventory_system.rs
index bb6bab8..11ac37f 100644
--- a/src/inventory_system.rs
+++ b/src/inventory_system.rs
@@ -1,6 +1,5 @@
 use crate::components::*;
-use crate::particle_system::ParticleBuilder;
-use crate::{game_log::GameLog, Map};
+use crate::{game_log::GameLog, particle_system::ParticleBuilder, Map};
 use rltk::RGB;
 use specs::prelude::*;
 
diff --git a/src/main.rs b/src/main.rs
index 88df956..e744714 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,6 @@
 use rltk::{GameState, Point, Rltk};
 use specs::prelude::*;
 use specs::saveload::{SimpleMarker, SimpleMarkerAllocator};
-extern crate serde;
 
 mod components;
 mod damage_system;
diff --git a/src/map_indexing_system.rs b/src/map_indexing_system.rs
index b64d8af..74c73df 100644
--- a/src/map_indexing_system.rs
+++ b/src/map_indexing_system.rs
@@ -1,4 +1,4 @@
-use super::{BlocksTile, Map, Position};
+use crate::{BlocksTile, Map, Position};
 use specs::prelude::*;
 
 pub struct MapIndexingSystem {}
diff --git a/src/spawner.rs b/src/spawner.rs
index ea41aeb..194ed94 100644
--- a/src/spawner.rs
+++ b/src/spawner.rs
@@ -1,8 +1,4 @@
-use crate::components::{
-    AreaOfEffect, BlocksTile, CombatStats, Confusion, Consumable, DefenseBonus, EquipmentSlot,
-    Equippable, InflictsDamage, Item, MeleePowerBonus, Monster, Name, Player, Position,
-    ProvidesHealing, Ranged, Renderable, SerializeMe, Viewshed,
-};
+use crate::components::*;
 use crate::{map::MAP_WIDTH, random_table::RandomTable, Rect};
 use rltk::{RandomNumberGenerator, RGB};
 use specs::prelude::*;
diff --git a/src/visibility_system.rs b/src/visibility_system.rs
index 4adf1b2..4fd8c4a 100644
--- a/src/visibility_system.rs
+++ b/src/visibility_system.rs
@@ -1,4 +1,4 @@
-use super::{Map, Player, Position, Viewshed};
+use crate::{Map, Player, Position, Viewshed};
 use rltk::{field_of_view, Point};
 use specs::prelude::*;