diff --git a/src/common_queries/list_w2l_inference_results.rs b/src/common_queries/list_w2l_inference_results.rs
index 8ad4eb5973..bbcd2fc8e6 100644
--- a/src/common_queries/list_w2l_inference_results.rs
+++ b/src/common_queries/list_w2l_inference_results.rs
@@ -242,7 +242,7 @@ WHERE
       .fetch_all(mysql_pool)
       .await?
   } else {
-    info!("listing w2l inference results for user; all");
+    info!("listing w2l inference results for user `{}`; all", scope_creator_username);
     sqlx::query_as!(
       RawW2lInferenceRecordForList,
         r#"
diff --git a/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs b/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs
index fcf046dd2f..98e2680b34 100644
--- a/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs
+++ b/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs
@@ -81,19 +81,21 @@ pub async fn infer_w2l_handler(
   request: web::Json<InferW2lRequest>,
   server_state: web::Data<Arc<ServerState>>) -> Result<HttpResponse, InferW2lError>
 {
-  let maybe_user_session = server_state
+  let maybe_session = server_state
     .session_checker
-    .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+    .maybe_get_session(&http_request, &server_state.mysql_pool)
     .await
     .map_err(|e| {
       warn!("Session checker error: {:?}", e);
       InferW2lError::ServerError
     })?;
 
-  let mut maybe_user_token : Option<String> = maybe_user_session
+  let mut maybe_user_token : Option<String> = maybe_session
     .as_ref()
     .map(|user_session| user_session.user_token.to_string());
 
+  info!("Enqueue infer w2l by user token: {:?}", maybe_user_token);
+
   let w2l_template_token = match &request.w2l_template_token {
     None => {
       // TODO: Allow image uploads.
diff --git a/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs b/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs
index 1d841f3c05..e86a323ed7 100644
--- a/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs
+++ b/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs
@@ -126,6 +126,23 @@ pub async fn enqueue_infer_w2l_with_uploads(
     return Err(HttpResponse::TooManyRequests().body("you already have pending requests").into())
   }*/
 
+  // ==================== READ SESSION ==================== //
+
+  let maybe_session = server_state
+    .session_checker
+    .maybe_get_session(&http_request, &server_state.mysql_pool)
+    .await
+    .map_err(|e| {
+      warn!("Session checker error: {:?}", e);
+      InferW2lWithUploadError::ServerError
+    })?;
+
+  let mut maybe_user_token : Option<String> = maybe_session
+    .as_ref()
+    .map(|user_session| user_session.user_token.to_string());
+
+  info!("Enqueue infer w2l by user token: {:?}", maybe_user_token);
+
   // ==================== READ MULTIPART REQUEST ==================== //
 
   info!("Reading multipart request...");
@@ -215,22 +232,6 @@ pub async fn enqueue_infer_w2l_with_uploads(
     return Err(InferW2lWithUploadError::BadInput("Template does not exist".to_string()));
   }
 
-  // ==================== READ SESSION ==================== //
-
-  let maybe_user_session = server_state
-    .session_checker
-    .maybe_get_user_session(&http_request, &server_state.mysql_pool)
-    .await
-    .map_err(|e| {
-      warn!("Session checker error: {:?}", e);
-      InferW2lWithUploadError::ServerError
-    })?;
-
-  let mut maybe_user_token : Option<String> = maybe_user_session
-    .as_ref()
-    .map(|user_session| user_session.user_token.to_string());
-
-
   // ==================== ANALYZE AND UPLOAD AUDIO FILE ==================== //
 
   let mut audio_type = "application/octet-stream".to_string();
diff --git a/src/main.rs b/src/main.rs
index d0e5e35abd..1cf04c6fe1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -53,12 +53,6 @@ use crate::buckets::bucket_client::BucketClient;
 use crate::http_server::endpoints::users::list_user_w2l_templates::list_user_w2l_templates_handler;
 use crate::http_server::endpoints::users::list_user_w2l_inference_results::list_user_w2l_inference_results_handler;
 
-///
-///  TODO TODO TODO TODO
-///  TODO TODO TODO TODO
-///       Make a central class that configures which bucket root paths things live in.
-///
-
 const DEFAULT_BIND_ADDRESS : &'static str = "0.0.0.0:12345";
 
 // NB: sqlx::query is spammy and logs all queries as "info"-level