diff --git a/src/api/v1/mcaptcha/easy.rs b/src/api/v1/mcaptcha/easy.rs
index 4d8ed523..9ce99a2b 100644
--- a/src/api/v1/mcaptcha/easy.rs
+++ b/src/api/v1/mcaptcha/easy.rs
@@ -113,10 +113,7 @@ async fn create(
         description: payload.description,
     };
 
-    let broke_my_site_traffic = match payload.broke_my_site_traffic {
-        Some(n) => Some(n as i32),
-        None => None,
-    };
+    let broke_my_site_traffic = payload.broke_my_site_traffic.map(|n| n as i32);
 
     let mcaptcha_config = create_runner(&msg, &data, &username).await?;
     sqlx::query!(
@@ -191,10 +188,7 @@ async fn update(
     .execute(&data.db)
     .await?;
 
-    let broke_my_site_traffic = match payload.pattern.broke_my_site_traffic {
-        Some(n) => Some(n as i32),
-        None => None,
-    };
+    let broke_my_site_traffic = payload.pattern.broke_my_site_traffic.map(|n| n as i32);
 
     sqlx::query!(
         "INSERT INTO mcaptcha_sitekey_user_provided_avg_traffic (
diff --git a/src/data.rs b/src/data.rs
index d098c863..8150a06a 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -166,6 +166,7 @@ impl Data {
         let creds = Self::get_creds();
         let c = creds.clone();
 
+        #[allow(unused_variables)]
         let init = thread::spawn(move || {
             log::info!("Initializing credential manager");
             c.init();
diff --git a/src/demo.rs b/src/demo.rs
index 17a16176..a5403f23 100644
--- a/src/demo.rs
+++ b/src/demo.rs
@@ -34,19 +34,13 @@ pub const DEMO_USER: &str = "aaronsw";
 pub const DEMO_PASSWORD: &str = "password";
 
 pub struct DemoUser {
-    data: AppData,
-    duration: Duration,
     handle: JoinHandle<()>,
 }
 
 impl DemoUser {
     pub async fn spawn(data: AppData, duration: Duration) -> ServiceResult<Self> {
-        let handle = Self::run(data.clone(), duration.clone()).await?;
-        let d = Self {
-            data,
-            duration,
-            handle,
-        };
+        let handle = Self::run(data, duration).await?;
+        let d = Self { handle };
 
         Ok(d)
     }
@@ -62,7 +56,7 @@ impl DemoUser {
             val: DEMO_USER.into(),
         };
 
-        if !username_exists(&user_exists_payload, &data).await?.exists {
+        if !username_exists(&user_exists_payload, data).await?.exists {
             let register_payload = Register {
                 username: DEMO_USER.into(),
                 password: DEMO_PASSWORD.into(),
@@ -71,7 +65,7 @@ impl DemoUser {
             };
 
             log::info!("Registering demo user");
-            match register_runner(&register_payload, &data).await {
+            match register_runner(&register_payload, data).await {
                 Err(ServiceError::UsernameTaken) | Ok(_) => Ok(()),
                 Err(e) => Err(e),
             }
@@ -82,7 +76,7 @@ impl DemoUser {
 
     async fn delete_demo_user(data: &AppData) -> ServiceResult<()> {
         log::info!("Deleting demo user");
-        delete_user(DEMO_USER, &data).await?;
+        delete_user(DEMO_USER, data).await?;
         Ok(())
     }
 
diff --git a/src/errors.rs b/src/errors.rs
index 356b917f..b9c420ba 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -123,7 +123,6 @@ impl ResponseError for ServiceError {
                 })
                 .unwrap(),
             )
-            .into()
     }
 
     #[cfg(not(tarpaulin_include))]