diff --git a/kanidm_client/tests/proto_v1_test.rs b/kanidm_client/tests/proto_v1_test.rs
index 8c197a69b..3c0ba3655 100644
--- a/kanidm_client/tests/proto_v1_test.rs
+++ b/kanidm_client/tests/proto_v1_test.rs
@@ -1,34 +1,16 @@
 #![deny(warnings)]
 
-#[macro_use]
-extern crate log;
-
-extern crate actix;
-use actix::prelude::*;
-
-extern crate kanidm;
-extern crate kanidm_client;
-extern crate kanidm_proto;
-extern crate serde_json;
-
-use kanidm_client::{KanidmClient, KanidmClientBuilder};
-
-use kanidm::config::{Configuration, IntegrationTestConfig};
-use kanidm::core::create_server_core;
-use kanidm_proto::v1::{Entry, Filter, Modify, ModifyList};
-
-extern crate reqwest;
-
-extern crate futures;
-// use futures::future;
-// use futures::future::Future;
-
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::mpsc;
 use std::thread;
 
-extern crate env_logger;
-extern crate tokio;
+use kanidm::config::{Configuration, IntegrationTestConfig};
+use kanidm::core::create_server_core;
+use kanidm_client::{KanidmClient, KanidmClientBuilder};
+use kanidm_proto::v1::{Entry, Filter, Modify, ModifyList};
+
+use actix::prelude::*;
+use log::debug;
 
 static PORT_ALLOC: AtomicUsize = AtomicUsize::new(8080);
 static ADMIN_TEST_PASSWORD: &'static str = "integration test admin password";
diff --git a/kanidm_tools/src/badlist_preprocess.rs b/kanidm_tools/src/badlist_preprocess.rs
index a176e89ed..1bf65152b 100644
--- a/kanidm_tools/src/badlist_preprocess.rs
+++ b/kanidm_tools/src/badlist_preprocess.rs
@@ -1,21 +1,16 @@
-extern crate structopt;
-
-// use shellexpand;
-use rayon::prelude::*;
-use serde_json;
 use std::fs::File;
 use std::io::prelude::*;
 use std::io::BufWriter;
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicUsize, Ordering};
-use structopt::StructOpt;
-use zxcvbn;
 
 use kanidm_proto::v1::Modify;
 
-extern crate env_logger;
-#[macro_use]
-extern crate log;
+use log::{debug, error, info};
+use rayon::prelude::*;
+use serde_json;
+use structopt::StructOpt;
+use zxcvbn;
 
 #[derive(Debug, StructOpt)]
 struct ClientOpt {
diff --git a/kanidm_tools/src/main.rs b/kanidm_tools/src/main.rs
index cea9a1535..05cc00ca7 100644
--- a/kanidm_tools/src/main.rs
+++ b/kanidm_tools/src/main.rs
@@ -1,20 +1,17 @@
-extern crate structopt;
-use kanidm_client::{KanidmClient, KanidmClientBuilder};
-use kanidm_proto::v1::{Entry, Filter, Modify, ModifyList};
-use serde::de::DeserializeOwned;
-use std::path::PathBuf;
-use structopt::StructOpt;
-
-use shellexpand;
 use std::collections::BTreeMap;
 use std::error::Error;
 use std::fs::File;
 use std::io::BufReader;
 use std::path::Path;
+use std::path::PathBuf;
 
-extern crate env_logger;
-#[macro_use]
-extern crate log;
+use kanidm_client::{KanidmClient, KanidmClientBuilder};
+use kanidm_proto::v1::{Entry, Filter, Modify, ModifyList};
+
+use log::debug;
+use serde::de::DeserializeOwned;
+use shellexpand;
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct CommonOpt {
diff --git a/kanidm_tools/src/ssh_authorizedkeys.rs b/kanidm_tools/src/ssh_authorizedkeys.rs
index 883a4e60c..5a7294b9d 100644
--- a/kanidm_tools/src/ssh_authorizedkeys.rs
+++ b/kanidm_tools/src/ssh_authorizedkeys.rs
@@ -1,12 +1,10 @@
-extern crate structopt;
-use kanidm_client::KanidmClientBuilder;
-use shellexpand;
 use std::path::PathBuf;
-use structopt::StructOpt;
 
-extern crate env_logger;
-#[macro_use]
-extern crate log;
+use kanidm_client::KanidmClientBuilder;
+
+use log::debug;
+use shellexpand;
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct ClientOpt {
diff --git a/kanidmd/src/server/main.rs b/kanidmd/src/server/main.rs
index ad376a6b8..9aefa49d2 100644
--- a/kanidmd/src/server/main.rs
+++ b/kanidmd/src/server/main.rs
@@ -1,13 +1,6 @@
 #![deny(warnings)]
 
-extern crate actix;
-extern crate env_logger;
-extern crate rpassword;
-
-extern crate kanidm;
-extern crate structopt;
-#[macro_use]
-extern crate log;
+use std::path::PathBuf;
 
 use kanidm::config::Configuration;
 use kanidm::core::{
@@ -15,7 +8,7 @@ use kanidm::core::{
     reindex_server_core, reset_sid_core, restore_server_core, verify_server_core,
 };
 
-use std::path::PathBuf;
+use log::{error, info};
 use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]