diff --git a/benches/feophant_benchmark.rs b/benches/feophant_benchmark.rs
index 9225796..e97a58f 100644
--- a/benches/feophant_benchmark.rs
+++ b/benches/feophant_benchmark.rs
@@ -1,15 +1,10 @@
-use std::sync::Arc;
-use std::time::Duration;
-
 use criterion::BenchmarkId;
 use criterion::Criterion;
 use criterion::{criterion_group, criterion_main};
-
 use feophantlib::constants::Nullable;
 use feophantlib::engine::io::row_formats::RowData;
 use feophantlib::engine::io::FileManager;
 use feophantlib::engine::io::LockCacheManager;
-use feophantlib::engine::io::LockManager;
 use feophantlib::engine::io::RowManager;
 use feophantlib::engine::objects::types::BaseSqlTypes;
 use feophantlib::engine::objects::types::BaseSqlTypesMapper;
@@ -18,6 +13,7 @@ use feophantlib::engine::objects::SqlTuple;
 use feophantlib::engine::objects::Table;
 use feophantlib::engine::transactions::TransactionId;
 use futures::pin_mut;
+use std::sync::Arc;
 use tempfile::TempDir;
 use tokio::runtime::Builder;
 use tokio_stream::StreamExt;
diff --git a/src/engine/io.rs b/src/engine/io.rs
index b1265a4..5ed67ad 100644
--- a/src/engine/io.rs
+++ b/src/engine/io.rs
@@ -23,9 +23,6 @@ mod lock_cache_manager;
 pub use lock_cache_manager::LockCacheManager;
 pub use lock_cache_manager::LockCacheManagerError;
 
-mod lock_manager;
-pub use lock_manager::LockManager;
-
 pub mod page_formats;
 
 pub mod row_formats;
diff --git a/src/engine/io/free_space_manager.rs b/src/engine/io/free_space_manager.rs
index 6ed7f08..50de9f0 100644
--- a/src/engine/io/free_space_manager.rs
+++ b/src/engine/io/free_space_manager.rs
@@ -10,8 +10,6 @@ use crate::constants::PAGE_SIZE;
 use bytes::{Buf, BytesMut};
 use thiserror::Error;
 
-const MAX_FREESPACE_COUNT: usize = 32;
-
 #[derive(Clone, Debug)]
 pub struct FreeSpaceManager {
     lock_cache_manager: LockCacheManager,
@@ -120,6 +118,7 @@ impl FreeSpaceManager {
 
     /// Gets the status of a field inside a page, you MUST pass an offset
     /// that fits in the buffer.
+    //TODO Decide if I end up keeping this or maybe move it to the unit test section?
     fn get_status_inside_page(buffer: &BytesMut, offset: usize) -> FreeStat {
         let offset_index = offset / 8;
         let offset_subindex = offset % 8;
diff --git a/tests/visibility_tests.rs b/tests/visibility_tests.rs
index 1a4f113..deac94e 100644
--- a/tests/visibility_tests.rs
+++ b/tests/visibility_tests.rs
@@ -1,10 +1,7 @@
 use feophantlib::{
     constants::Nullable,
     engine::{
-        io::{
-            row_formats::RowData, FileManager, LockCacheManager, LockManager, RowManager,
-            VisibleRowManager,
-        },
+        io::{row_formats::RowData, FileManager, LockCacheManager, RowManager, VisibleRowManager},
         objects::{
             types::{BaseSqlTypes, BaseSqlTypesMapper},
             Attribute, SqlTuple, Table,