diff --git a/crates/app/storyteller_web/src/database/mediators/badge_granter.rs b/crates/app/storyteller_web/src/database/mediators/badge_granter.rs
index 126409c4e3..714d4affb2 100644
--- a/crates/app/storyteller_web/src/database/mediators/badge_granter.rs
+++ b/crates/app/storyteller_web/src/database/mediators/badge_granter.rs
@@ -233,7 +233,7 @@ LIMIT 1
       Ok(_record) => true,
       Err(err) => {
         match err {
-          RowNotFound => false,
+          sqlx::Error::RowNotFound => false,
           _ => {
             warn!("query error: {:?}", err);
             return Err(anyhow!("error querying: {:?}", err));
@@ -352,7 +352,7 @@ SET
       Ok(record) => record.count as u64,
       Err(err) => {
         match err {
-          RowNotFound => 0,
+          sqlx::Error::RowNotFound => 0,
           _ => {
             warn!("query error: {:?}", err);
             return Err(anyhow!("error querying: {:?}", err));
diff --git a/crates/app/storyteller_web/src/database/queries/calculate_tts_model_leaderboard.rs b/crates/app/storyteller_web/src/database/queries/calculate_tts_model_leaderboard.rs
index 106e7d4b25..1aeb5cc3cb 100644
--- a/crates/app/storyteller_web/src/database/queries/calculate_tts_model_leaderboard.rs
+++ b/crates/app/storyteller_web/src/database/queries/calculate_tts_model_leaderboard.rs
@@ -59,7 +59,7 @@ LIMIT 25;
       warn!("Error: {:?}", err);
 
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Ok(Vec::new());
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/database/queries/calculate_w2l_template_leaderboard.rs b/crates/app/storyteller_web/src/database/queries/calculate_w2l_template_leaderboard.rs
index 505342d8d6..0f830bad3a 100644
--- a/crates/app/storyteller_web/src/database/queries/calculate_w2l_template_leaderboard.rs
+++ b/crates/app/storyteller_web/src/database/queries/calculate_w2l_template_leaderboard.rs
@@ -60,7 +60,7 @@ LIMIT 25;
       warn!("Error: {:?}", err);
 
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Ok(Vec::new());
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/database/queries/get_user_profile_by_username.rs b/crates/app/storyteller_web/src/database/queries/get_user_profile_by_username.rs
index 7b84bdbc4f..939192e0a6 100644
--- a/crates/app/storyteller_web/src/database/queries/get_user_profile_by_username.rs
+++ b/crates/app/storyteller_web/src/database/queries/get_user_profile_by_username.rs
@@ -90,7 +90,7 @@ WHERE
     Ok(profile_record) => profile_record,
     Err(err) => {
       return match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           Ok(None)
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/database/queries/list_ip_bans.rs b/crates/app/storyteller_web/src/database/queries/list_ip_bans.rs
index 98e12b8368..998a0d9cd4 100644
--- a/crates/app/storyteller_web/src/database/queries/list_ip_bans.rs
+++ b/crates/app/storyteller_web/src/database/queries/list_ip_bans.rs
@@ -52,7 +52,7 @@ WHERE
   match maybe_results {
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           Ok(Vec::new())
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/database/queries/list_user_badges.rs b/crates/app/storyteller_web/src/database/queries/list_user_badges.rs
index b333920a64..5e597bb9c4 100644
--- a/crates/app/storyteller_web/src/database/queries/list_user_badges.rs
+++ b/crates/app/storyteller_web/src/database/queries/list_user_badges.rs
@@ -53,7 +53,7 @@ WHERE
     Err(err) => {
       warn!("Error: {:?}", err);
       match err {
-        RowNotFound => Vec::new(),
+        sqlx::Error::RowNotFound => Vec::new(),
         _ => {
           warn!("user badges query error: {:?}", err);
           return Err(anyhow!("error querying user badges"));
diff --git a/crates/app/storyteller_web/src/database/queries/list_user_roles.rs b/crates/app/storyteller_web/src/database/queries/list_user_roles.rs
index da4619f772..129b581fa0 100644
--- a/crates/app/storyteller_web/src/database/queries/list_user_roles.rs
+++ b/crates/app/storyteller_web/src/database/queries/list_user_roles.rs
@@ -113,7 +113,7 @@ FROM user_roles
     Err(err) => {
       warn!("Error: {:?}", err);
       match err {
-        RowNotFound => Vec::new(),
+        sqlx::Error::RowNotFound => Vec::new(),
         _ => {
           warn!("user role query error: {:?}", err);
           return Err(anyhow!("error querying user roles"));
diff --git a/crates/app/storyteller_web/src/database/queries/query_tts_model.rs b/crates/app/storyteller_web/src/database/queries/query_tts_model.rs
index f15043c24a..bbc3b4f41a 100644
--- a/crates/app/storyteller_web/src/database/queries/query_tts_model.rs
+++ b/crates/app/storyteller_web/src/database/queries/query_tts_model.rs
@@ -100,7 +100,7 @@ pub async fn select_tts_model_by_token(
     Ok(model) => model,
     Err(ref err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           warn!("tts model not found: {:?}", &err);
           return Ok(None);
         },
diff --git a/crates/app/storyteller_web/src/database/queries/query_tts_result.rs b/crates/app/storyteller_web/src/database/queries/query_tts_result.rs
index f8ce3a52bc..6b93c0a30b 100644
--- a/crates/app/storyteller_web/src/database/queries/query_tts_result.rs
+++ b/crates/app/storyteller_web/src/database/queries/query_tts_result.rs
@@ -120,7 +120,7 @@ pub async fn select_tts_result_by_token(
     Ok(inference_result) => inference_result,
     Err(ref err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           warn!("tts result not found: {:?}", &err);
           return Ok(None);
         },
diff --git a/crates/app/storyteller_web/src/database/queries/query_w2l_result.rs b/crates/app/storyteller_web/src/database/queries/query_w2l_result.rs
index eb51f60bce..ce38cb86cb 100644
--- a/crates/app/storyteller_web/src/database/queries/query_w2l_result.rs
+++ b/crates/app/storyteller_web/src/database/queries/query_w2l_result.rs
@@ -119,7 +119,7 @@ pub async fn select_w2l_result_by_token(
     Ok(inference_result) => inference_result,
     Err(ref err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           warn!("w2l result not found: {:?}", &err);
           return Ok(None);
         },
diff --git a/crates/app/storyteller_web/src/database/queries/query_w2l_template.rs b/crates/app/storyteller_web/src/database/queries/query_w2l_template.rs
index d32af7445f..29ce15a925 100644
--- a/crates/app/storyteller_web/src/database/queries/query_w2l_template.rs
+++ b/crates/app/storyteller_web/src/database/queries/query_w2l_template.rs
@@ -94,7 +94,7 @@ pub async fn select_w2l_template_by_token(
     Ok(template) => template,
     Err(ref err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           warn!("w2l template not found: {:?}", &err);
           return Ok(None);
         },
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/events/list_events.rs b/crates/app/storyteller_web/src/http_server/endpoints/events/list_events.rs
index 1822edcdaa..250a09e651 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/events/list_events.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/events/list_events.rs
@@ -91,7 +91,7 @@ LIMIT 25
     Ok(events) => events,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Err(ListEventsError::ServerError);
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs b/crates/app/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs
index f0a6f7b1bc..5752c04ac5 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs
@@ -126,7 +126,7 @@ WHERE
     Ok(results) => results,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           Vec::new()
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs b/crates/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs
index 20b174bd60..6974d68473 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs
@@ -148,7 +148,7 @@ LIMIT 1
     },
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Err(GetIpBanError::NotFound);
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs b/crates/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs
index 1ebea79e13..153a8f85e1 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs
@@ -135,7 +135,7 @@ WHERE
     },
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           Vec::new()
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs b/crates/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs
index 3558c33897..0ccc33e3d1 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs
@@ -105,7 +105,7 @@ LIMIT 1
     Ok(result) => result,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           // NB: Not Found for null results means nothing is pending in the queue
           PendingCountResult {
             pending_count: None,
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs b/crates/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs
index 867e88182c..3188055b6f 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs
@@ -105,7 +105,7 @@ LIMIT 1
     Ok(result) => result,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           // NB: Not Found for null results means nothing is pending in the queue
           PendingCountResult {
             pending_count: None,
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs b/crates/app/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs
index b8810e2d21..38eb438994 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs
@@ -101,7 +101,7 @@ SELECT public_count, all_count FROM (
     Ok(result) => result,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           // NB: Not Found for null results means nothing is pending in the queue
           VoiceStats {
             all_count: -1,
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs b/crates/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs
index d79a244d8c..054dec8fcb 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs
@@ -124,7 +124,7 @@ WHERE
     },
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           Vec::new()
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs b/crates/app/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs
index 8cc570619d..541a496ec6 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs
@@ -143,7 +143,7 @@ WHERE jobs.token = ?
     Ok(record) => record,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Err(GetTtsInferenceStatusError::ServerError);
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs b/crates/app/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs
index ea5b9c97e7..3434facbb9 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs
@@ -118,7 +118,7 @@ WHERE jobs.token = ?
     Ok(record) => record,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Err(GetTtsUploadModelStatusError::ServerError);
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/users/get_profile.rs b/crates/app/storyteller_web/src/http_server/endpoints/users/get_profile.rs
index e3f464a7bb..5556e2d745 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/users/get_profile.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/users/get_profile.rs
@@ -181,7 +181,7 @@ WHERE
     Ok(profile_record) => profile_record,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           warn!("Invalid user");
           return Err(ProfileError::NotFound);
         },
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs b/crates/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs
index 0e9e63b3e5..a4b3925b81 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs
@@ -378,7 +378,7 @@ WHERE
     },
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           false
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs b/crates/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs
index 5997d0856a..e881cfb838 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs
@@ -137,7 +137,7 @@ WHERE jobs.token = ?
     Ok(record) => record,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Err(GetW2lInferenceStatusError::ServerError);
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs b/crates/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs
index c3f26bf6b3..7ba87e2a2e 100644
--- a/crates/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs
+++ b/crates/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs
@@ -124,7 +124,7 @@ WHERE jobs.token = ?
     Ok(record) => record,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Err(GetW2lUploadTemplateStatusError::ServerError);
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/job_queries/tts_download_job_queries.rs b/crates/app/storyteller_web/src/job_queries/tts_download_job_queries.rs
index 712b6c4a57..1ff2073a5d 100644
--- a/crates/app/storyteller_web/src/job_queries/tts_download_job_queries.rs
+++ b/crates/app/storyteller_web/src/job_queries/tts_download_job_queries.rs
@@ -92,7 +92,7 @@ FOR UPDATE
     Ok(record) => record,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Err(anyhow!("could not job"));
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/job_queries/tts_inference_job_queries.rs b/crates/app/storyteller_web/src/job_queries/tts_inference_job_queries.rs
index 55f17f8efa..8ebfb02157 100644
--- a/crates/app/storyteller_web/src/job_queries/tts_inference_job_queries.rs
+++ b/crates/app/storyteller_web/src/job_queries/tts_inference_job_queries.rs
@@ -116,7 +116,7 @@ FOR UPDATE
     Ok(record) => record,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Err(anyhow!("could not job"));
         },
         _ => {
@@ -475,7 +475,7 @@ WHERE tts.token = ?
     Ok(model) => model,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Err(TtsModelForInferenceError::ModelNotFound);
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/job_queries/w2l_download_job_queries.rs b/crates/app/storyteller_web/src/job_queries/w2l_download_job_queries.rs
index 0cc6394108..77998b0327 100644
--- a/crates/app/storyteller_web/src/job_queries/w2l_download_job_queries.rs
+++ b/crates/app/storyteller_web/src/job_queries/w2l_download_job_queries.rs
@@ -91,7 +91,7 @@ FOR UPDATE
     Ok(record) => record,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Err(anyhow!("could not job"));
         },
         _ => {
diff --git a/crates/app/storyteller_web/src/job_queries/w2l_inference_job_queries.rs b/crates/app/storyteller_web/src/job_queries/w2l_inference_job_queries.rs
index 0e77bd6c33..de013eda66 100644
--- a/crates/app/storyteller_web/src/job_queries/w2l_inference_job_queries.rs
+++ b/crates/app/storyteller_web/src/job_queries/w2l_inference_job_queries.rs
@@ -137,7 +137,7 @@ FOR UPDATE
     Ok(record) => record,
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           return Err(anyhow!("could not job"));
         },
         _ => {
@@ -441,7 +441,7 @@ AND w2l.mod_deleted_at IS NULL
     Ok(template) => Ok(Some(template)),
     Err(err) => {
       match err {
-        RowNotFound => {
+        sqlx::Error::RowNotFound => {
           Ok(None)
         },
         _ => {
diff --git a/crates/lib/http_server_common/src/endpoints/default_route_404.rs b/crates/lib/http_server_common/src/endpoints/default_route_404.rs
index 6bc7403c15..15a0985f2a 100644
--- a/crates/lib/http_server_common/src/endpoints/default_route_404.rs
+++ b/crates/lib/http_server_common/src/endpoints/default_route_404.rs
@@ -1,4 +1,4 @@
-use actix_http::http::StatusCode;
+
 use actix_web::{HttpResponse, HttpRequest, Responder, get};
 use log::warn;
 
diff --git a/crates/lib/http_server_common/src/endpoints/root_index.rs b/crates/lib/http_server_common/src/endpoints/root_index.rs
index fe50b3a901..1d96a50fcf 100644
--- a/crates/lib/http_server_common/src/endpoints/root_index.rs
+++ b/crates/lib/http_server_common/src/endpoints/root_index.rs
@@ -1,8 +1,8 @@
 use actix_http::http::StatusCode;
-use actix_web::{HttpResponse, HttpRequest, get};
-use actix_web::Responder;
-use actix_web::Result;
-use actix_web::Error;
+use actix_web::{HttpResponse};
+
+
+
 use log::debug;
 
 pub async fn get_root_index() -> HttpResponse {
diff --git a/crates/lib/http_server_common/src/response/response_error_helpers.rs b/crates/lib/http_server_common/src/response/response_error_helpers.rs
index 1bd6bf274b..5247186d21 100644
--- a/crates/lib/http_server_common/src/response/response_error_helpers.rs
+++ b/crates/lib/http_server_common/src/response/response_error_helpers.rs
@@ -1,7 +1,7 @@
 use actix_http::http::header;
 use actix_web::HttpResponseBuilder;
 use actix_web::http::StatusCode;
-use actix_web::{HttpResponse, ResponseError};
+use actix_web::{HttpResponse};
 
 
 #[derive(Serialize)]
diff --git a/crates/lib/http_server_common/src/response/serialize_as_json_error.rs b/crates/lib/http_server_common/src/response/serialize_as_json_error.rs
index d288c9205e..548488e2ff 100644
--- a/crates/lib/http_server_common/src/response/serialize_as_json_error.rs
+++ b/crates/lib/http_server_common/src/response/serialize_as_json_error.rs
@@ -1,4 +1,4 @@
-use actix_http::http::{StatusCode, header};
+use actix_http::http::{header};
 use actix_web::HttpResponse;
 use actix_web::HttpResponseBuilder;
 use actix_web::error::ResponseError;