diff --git a/sfw-provider-requests/src/lib.rs b/sfw-provider-requests/src/lib.rs
index efc7bf8ef9..70e06feaad 100644
--- a/sfw-provider-requests/src/lib.rs
+++ b/sfw-provider-requests/src/lib.rs
@@ -3,3 +3,5 @@ pub mod responses;
 
 pub const DUMMY_MESSAGE_CONTENT: &[u8] =
     b"[DUMMY MESSAGE] Wanting something does not give you the right to have it.";
+
+pub type AuthToken = [u8; 32];
diff --git a/sfw-provider-requests/src/requests.rs b/sfw-provider-requests/src/requests.rs
index 0308204f05..3dba30c038 100644
--- a/sfw-provider-requests/src/requests.rs
+++ b/sfw-provider-requests/src/requests.rs
@@ -1,3 +1,4 @@
+use crate::AuthToken;
 use sphinx::route::DestinationAddressBytes;
 
 const PULL_REQUEST_MESSAGE_PREFIX: [u8; 2] = [1, 0];
@@ -50,8 +51,6 @@ where
     fn from_bytes(bytes: &[u8]) -> Result<Self, ProviderRequestError>;
 }
 
-pub type AuthToken = [u8; 32];
-
 #[derive(Debug)]
 pub struct PullRequest {
     // TODO: public keys, signatures, tokens, etc. basically some kind of authentication bs
diff --git a/sfw-provider-requests/src/responses.rs b/sfw-provider-requests/src/responses.rs
index b67c97f5c2..870f527334 100644
--- a/sfw-provider-requests/src/responses.rs
+++ b/sfw-provider-requests/src/responses.rs
@@ -1,4 +1,4 @@
-use crate::requests::{AuthToken, RegisterRequest};
+use crate::AuthToken;
 use std::convert::TryInto;
 
 #[derive(Debug)]
diff --git a/src/main.rs b/src/main.rs
index 77aa7fce27..d32b6c592d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,6 @@
 use crate::provider::presence;
 use crate::provider::ServiceProvider;
 use clap::{App, Arg, ArgMatches, SubCommand};
-use curve25519_dalek::scalar::Scalar;
 use std::net::ToSocketAddrs;
 use std::path::PathBuf;
 use std::process;
diff --git a/src/provider/client_handling/mod.rs b/src/provider/client_handling/mod.rs
index babfd3d441..06a2421f23 100644
--- a/src/provider/client_handling/mod.rs
+++ b/src/provider/client_handling/mod.rs
@@ -1,25 +1,18 @@
 use crate::provider::storage::{ClientStorage, StoreError};
 use crate::provider::ClientLedger;
-use curve25519_dalek::digest::Digest;
 use curve25519_dalek::scalar::Scalar;
 use futures::lock::Mutex as FMutex;
 use hmac::{Hmac, Mac};
-use serde::{Deserialize, Serialize};
-use serde_json::json;
 use sfw_provider_requests::requests::{
-    AuthToken, ProviderRequest, ProviderRequestError, ProviderRequests, PullRequest,
+    ProviderRequestError, ProviderRequests, PullRequest,
     RegisterRequest,
 };
 use sfw_provider_requests::responses::{ProviderResponse, PullResponse, RegisterResponse};
 use sha2::Sha256;
-use sphinx::route::DestinationAddressBytes;
-use std::collections::HashMap;
-use std::hash::Hash;
 use std::io;
 use std::path::{Path, PathBuf};
-use futures::{Future, AsyncReadExt};
-use std::sync::{Arc, RwLock};
-use std::error::Error;
+use std::sync::Arc;
+use sfw_provider_requests::AuthToken;
 
 type HmacSha256 = Hmac<Sha256>;
 
@@ -29,7 +22,7 @@ pub enum ClientProcessingError {
     StoreError,
     InvalidRequest,
     WrongToken,
-    IOError
+    IOError,
 }
 
 impl From<ProviderRequestError> for ClientProcessingError {
diff --git a/src/provider/mod.rs b/src/provider/mod.rs
index c5811ba24e..1541cb771a 100644
--- a/src/provider/mod.rs
+++ b/src/provider/mod.rs
@@ -10,7 +10,7 @@ use crate::provider::client_handling::{ClientProcessingData, ClientRequestProces
 use crate::provider::mix_handling::{MixPacketProcessor, MixProcessingData};
 use crate::provider::storage::ClientStorage;
 use futures::io::Error;
-use sfw_provider_requests::requests::AuthToken;
+use sfw_provider_requests::AuthToken;
 use sphinx::route::DestinationAddressBytes;
 use std::collections::HashMap;
 use futures::lock::Mutex as FMutex;
@@ -82,7 +82,8 @@ impl ClientLedger {
         self.0.insert(auth_token, client_address)
     }
 
-    fn load(file: PathBuf) -> Self {
+    #[allow(dead_code)]
+    fn load(_file: PathBuf) -> Self {
         unimplemented!()
     }
 }
diff --git a/src/provider/storage/mod.rs b/src/provider/storage/mod.rs
index 090e12d1de..a44f76a8e7 100644
--- a/src/provider/storage/mod.rs
+++ b/src/provider/storage/mod.rs
@@ -22,6 +22,7 @@ impl From<std::io::Error> for StoreError {
 
 pub struct StoreData {
     client_address: DestinationAddressBytes,
+    #[allow(dead_code)]
     client_surb_id: SURBIdentifier,
     message: Vec<u8>,
 }