diff --git a/src/effects/hunger.rs b/src/effects/hunger.rs
index b274041..d46075c 100644
--- a/src/effects/hunger.rs
+++ b/src/effects/hunger.rs
@@ -1,5 +1,5 @@
 use super::{
-    triggers::{BLESSED, CURSED, UNCURSED},
+    triggers::{BLESSED, UNCURSED},
     EffectSpawner, EffectType,
 };
 use crate::{HungerClock, HungerState};
diff --git a/src/effects/triggers.rs b/src/effects/triggers.rs
index ff27219..3367bc2 100644
--- a/src/effects/triggers.rs
+++ b/src/effects/triggers.rs
@@ -117,6 +117,7 @@ fn handle_damage(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Lo
     return logger;
 }
 
+#[allow(unused_mut)]
 fn handle_confusion(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Logger) -> gamelog::Logger {
     if let Some(confusion) = ecs.read_storage::<Confusion>().get(event.entity) {
         add_effect(event.source, EffectType::Confusion { turns: confusion.turns }, event.target.clone());
diff --git a/src/inventory/collection_system.rs b/src/inventory/collection_system.rs
index 3c54c35..dfcf5eb 100644
--- a/src/inventory/collection_system.rs
+++ b/src/inventory/collection_system.rs
@@ -1,8 +1,7 @@
-use super::{
-    gamelog, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, Position, Wand,
-    WantsToPickupItem,
+use crate::{
+    gamelog, gui::obfuscate_name, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
+    Position, Wand, WantsToPickupItem,
 };
-use crate::gui::obfuscate_name;
 use specs::prelude::*;
 
 pub struct ItemCollectionSystem {}
diff --git a/src/inventory/drop_system.rs b/src/inventory/drop_system.rs
index 1f23442..0a9df3f 100644
--- a/src/inventory/drop_system.rs
+++ b/src/inventory/drop_system.rs
@@ -1,8 +1,7 @@
-use super::{
-    gamelog, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, Position, Wand,
-    WantsToDropItem,
+use crate::{
+    gamelog, gui::obfuscate_name, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
+    Position, Wand, WantsToDropItem,
 };
-use crate::gui::obfuscate_name;
 use specs::prelude::*;
 
 pub struct ItemDropSystem {}
diff --git a/src/inventory/equip_system.rs b/src/inventory/equip_system.rs
index 8f22342..82c5886 100644
--- a/src/inventory/equip_system.rs
+++ b/src/inventory/equip_system.rs
@@ -1,8 +1,9 @@
-use super::{
-    gamelog, EquipmentChanged, Equippable, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
+use crate::{
+    gamelog,
+    gui::{item_colour, obfuscate_name},
+    EquipmentChanged, Equippable, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
     WantsToUseItem,
 };
-use crate::gui::{item_colour, obfuscate_name};
 use specs::prelude::*;
 
 pub struct ItemEquipSystem {}
diff --git a/src/inventory/identification_system.rs b/src/inventory/identification_system.rs
index 4e34123..2875ffd 100644
--- a/src/inventory/identification_system.rs
+++ b/src/inventory/identification_system.rs
@@ -1,5 +1,4 @@
-use super::{IdentifiedItem, MasterDungeonMap, Name, ObfuscatedName};
-use crate::{Item, Player};
+use crate::{IdentifiedItem, Item, MasterDungeonMap, Name, ObfuscatedName, Player};
 use specs::prelude::*;
 
 pub struct ItemIdentificationSystem {}
diff --git a/src/inventory/mod.rs b/src/inventory/mod.rs
index 3fafaf3..948f991 100644
--- a/src/inventory/mod.rs
+++ b/src/inventory/mod.rs
@@ -1,11 +1,3 @@
-use super::{
-    gamelog, Confusion, Consumable, Cursed, Destructible, Digger, EquipmentChanged, Equippable, Equipped, HungerClock,
-    HungerState, IdentifiedItem, InBackpack, InflictsDamage, MagicItem, MagicMapper, Map, MasterDungeonMap, Name,
-    ObfuscatedName, ParticleBuilder, Point, Pools, Position, ProvidesHealing, ProvidesNutrition, RandomNumberGenerator,
-    RunState, TileType, Viewshed, Wand, WantsToDropItem, WantsToPickupItem, WantsToRemoveItem, WantsToUseItem, AOE,
-    DEFAULT_PARTICLE_LIFETIME, LONG_PARTICLE_LIFETIME,
-};
-
 mod collection_system;
 mod drop_system;
 mod equip_system;
diff --git a/src/inventory/remove_system.rs b/src/inventory/remove_system.rs
index 9078617..ce543ea 100644
--- a/src/inventory/remove_system.rs
+++ b/src/inventory/remove_system.rs
@@ -1,5 +1,8 @@
-use super::{gamelog, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, WantsToRemoveItem};
-use crate::gui::{item_colour, obfuscate_name};
+use crate::{
+    gamelog,
+    gui::{item_colour, obfuscate_name},
+    Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, WantsToRemoveItem,
+};
 use specs::prelude::*;
 
 pub struct ItemRemoveSystem {}
diff --git a/src/inventory/use_system.rs b/src/inventory/use_system.rs
index e9d6212..fc51fe6 100644
--- a/src/inventory/use_system.rs
+++ b/src/inventory/use_system.rs
@@ -1,5 +1,7 @@
-use super::{EquipmentChanged, IdentifiedItem, Map, Name, WantsToUseItem, AOE};
-use crate::effects::*;
+use crate::{
+    effects::{add_effect, aoe_tiles, EffectType, Targets},
+    EquipmentChanged, IdentifiedItem, Map, Name, WantsToUseItem, AOE,
+};
 use specs::prelude::*;
 
 pub struct ItemUseSystem {}
diff --git a/src/particle_system.rs b/src/particle_system.rs
index 48f5811..83af51c 100644
--- a/src/particle_system.rs
+++ b/src/particle_system.rs
@@ -150,17 +150,6 @@ impl ParticleBuilder {
         );
     }
 
-    pub fn heal(&mut self, x: i32, y: i32) {
-        self.request(
-            x,
-            y,
-            rltk::RGB::named(rltk::GREEN),
-            rltk::RGB::named(rltk::BLACK),
-            rltk::to_cp437('♥'),
-            DEFAULT_PARTICLE_LIFETIME,
-        );
-    }
-
     pub fn kick(&mut self, x: i32, y: i32) {
         self.request(
             x,
@@ -194,6 +183,7 @@ impl ParticleBuilder {
     }
 
     // Makes a rainbow particle request in the shape of an 'x'. Sort of.
+    #[allow(dead_code)]
     pub fn request_rainbow_star(&mut self, x: i32, y: i32, glyph: rltk::FontCharType, lifetime: f32) {
         let bg = RGB::named(rltk::BLACK);
         let eighth_l = lifetime / 8.0;