diff --git a/src/common_file_operations.rs b/src/common_file_operations.rs
index 135a6e6..5c293ef 100644
--- a/src/common_file_operations.rs
+++ b/src/common_file_operations.rs
@@ -11,14 +11,12 @@ pub(crate) fn write_bool_as<T: std::convert::From<u8>>(x: &bool) -> T {
 
 #[cfg(test)]
 mod tests {
-    use std::io::Cursor;
-    use crate::common_file_operations::{read_bool_from, write_bool_as};
-    use crate::model::MDL;
+    use super::*;
 
     const DATA: [u8; 2] = [0u8, 1u8];
 
     // TODO: add tests for u16
-    
+
     #[test]
     fn read_bool_u8() {
         assert!(!read_bool_from::<u8>(DATA[0]));
diff --git a/src/fiin.rs b/src/fiin.rs
index 393de07..955da22 100644
--- a/src/fiin.rs
+++ b/src/fiin.rs
@@ -97,7 +97,7 @@ impl FileInfo {
 
 #[cfg(test)]
 mod tests {
-    use std::fs::{File, read};
+    use std::fs::read;
     use std::path::PathBuf;
 
     use crate::fiin::FileInfo;
diff --git a/src/gamedata.rs b/src/gamedata.rs
index c6fb179..c3d372d 100755
--- a/src/gamedata.rs
+++ b/src/gamedata.rs
@@ -447,7 +447,7 @@ mod tests {
 
     #[test]
     fn repository_ordering() {
-        let mut data = common_setup_data();
+        let data = common_setup_data();
 
         assert_eq!(data.repositories[0].name, "ffxiv");
         assert_eq!(data.repositories[1].name, "ex1");
@@ -456,7 +456,7 @@ mod tests {
 
     #[test]
     fn repository_and_category_parsing() {
-        let mut data = common_setup_data();
+        let data = common_setup_data();
 
         assert_eq!(
             data.parse_repository_category("exd/root.exl").unwrap(),
diff --git a/src/lgb.rs b/src/lgb.rs
index da049f6..148f1f8 100644
--- a/src/lgb.rs
+++ b/src/lgb.rs
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2024 Joshua Goins <josh@redstrate.com>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-use std::io::{Cursor, Read, Seek, SeekFrom};
+use std::io::{Cursor, Seek, SeekFrom};
 
 use binrw::{BinRead, binread, BinReaderExt};
 use binrw::binrw;
@@ -263,8 +263,6 @@ enum PopType
     PC = 0x1,
     #[br(magic = 0x2u8)]
     NPC,
-    #[br(magic = 0x2u8)]
-    BNPC,
     #[br(magic = 0x3u8)]
     Content,
 }
@@ -486,9 +484,9 @@ impl Layer {
     pub fn from_existing(buffer: ByteSpan) -> Option<Layer> {
         let mut cursor = Cursor::new(buffer);
 
-        let mut file_header = LgbHeader::read(&mut cursor).unwrap();
+        let file_header = LgbHeader::read(&mut cursor).unwrap();
 
-        let mut chunk_header = LayerChunk::read(&mut cursor).unwrap();
+        let chunk_header = LayerChunk::read(&mut cursor).unwrap();
 
         let old_pos = cursor.position();
 
@@ -502,9 +500,7 @@ impl Layer {
 
             let old_pos = cursor.position();
 
-            let mut header = LayerHeader::read(&mut cursor).unwrap();
-
-            println!("{:#?}", header);
+            let header = LayerHeader::read(&mut cursor).unwrap();
 
             cursor.seek(SeekFrom::Start(old_pos + header.instance_object_offset as u64)).unwrap();
 
@@ -514,7 +510,7 @@ impl Layer {
             }
 
             cursor.seek(SeekFrom::Start(old_pos + header.layer_set_referenced_list_offset as u64)).unwrap();
-            let mut referenced_list = LayerSetReferencedList::read(&mut cursor).unwrap();
+            let referenced_list = LayerSetReferencedList::read(&mut cursor).unwrap();
 
             for i in 0..header.instance_object_count {
                 cursor.seek(SeekFrom::Start(old_pos + header.instance_object_offset as u64 + instance_offsets[i as usize] as u64)).unwrap();
diff --git a/src/model.rs b/src/model.rs
index 023526a..6fac7f2 100755
--- a/src/model.rs
+++ b/src/model.rs
@@ -7,6 +7,7 @@ use std::mem::size_of;
 use binrw::{binrw, BinWrite, BinWriterExt};
 use binrw::BinRead;
 use binrw::BinReaderExt;
+
 use crate::{ByteBuffer, ByteSpan};
 use crate::common_file_operations::{read_bool_from, write_bool_as};
 use crate::model_vertex_declarations::{vertex_element_parser, VERTEX_ELEMENT_SIZE, vertex_element_writer, VertexDeclaration, VertexType, VertexUsage};
@@ -1036,12 +1037,12 @@ impl ModelData {
 #[cfg(test)]
 mod tests {
     use std::fs::read;
-    use std::io::Cursor;
     use std::mem::size_of;
     use std::path::PathBuf;
-    use crate::dat::FileType::Model;
-    use crate::model::{MDL, ModelFileHeader};
-    use crate::model_vertex_declarations::{VERTEX_ELEMENT_SIZE, VertexElement};
+
+    use crate::model_vertex_declarations::VERTEX_ELEMENT_SIZE;
+
+    use super::*;
 
     #[test]
     fn test_file_header_size() {
@@ -1132,7 +1133,7 @@ mod tests {
         d.push("resources/tests");
         d.push("c0201e0038_top_zeroed.mdl");
 
-        let mut mdl = MDL::from_existing(&read(d).unwrap()).unwrap();
+        let mdl = MDL::from_existing(&read(d).unwrap()).unwrap();
 
         // file header
         assert_eq!(mdl.file_header.version, 16777221);
diff --git a/src/patch.rs b/src/patch.rs
index 6eff907..04340a1 100755
--- a/src/patch.rs
+++ b/src/patch.rs
@@ -9,7 +9,6 @@ use std::path::PathBuf;
 
 use binrw::binread;
 use binrw::BinRead;
-use binrw::binrw;
 use tracing::{debug, warn};
 
 use crate::common::{get_platform_string, Platform, Region};
diff --git a/src/repository.rs b/src/repository.rs
index 1878ae3..75aae14 100755
--- a/src/repository.rs
+++ b/src/repository.rs
@@ -4,7 +4,6 @@
 use std::cmp::Ordering;
 use std::cmp::Ordering::{Greater, Less};
 use std::path::{Path, PathBuf};
-use binrw::binrw;
 
 use crate::common::{get_platform_string, Platform, read_version};
 use crate::repository::RepositoryType::{Base, Expansion};
@@ -214,7 +213,7 @@ mod tests {
     use std::path::PathBuf;
     use crate::common::Platform;
 
-    use crate::repository::{Category, Repository, RepositoryType};
+    use super::*;
 
     #[test]
     fn test_base() {
diff --git a/src/tera.rs b/src/tera.rs
index fc9e6ba..4737e48 100644
--- a/src/tera.rs
+++ b/src/tera.rs
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2024 Joshua Goins <josh@redstrate.com>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-use std::io::{Cursor, Seek};
+use std::io::Cursor;
 
 use binrw::BinRead;
 use binrw::binrw;