diff --git a/citadel-desktopd/src/main.rs b/citadel-desktopd/src/main.rs
index 031d2bd..de3dce8 100644
--- a/citadel-desktopd/src/main.rs
+++ b/citadel-desktopd/src/main.rs
@@ -2,11 +2,6 @@
 #[macro_use] extern crate lazy_static;
 #[macro_use] extern crate log;
 #[macro_use] extern crate serde_derive;
-extern crate env_logger;
-extern crate serde;
-extern crate toml;
-extern crate inotify;
-extern crate nix;
 
 mod desktop;
 mod parser;
diff --git a/citadel-image/Cargo.toml b/citadel-image/Cargo.toml
index 30789f9..8f0391b 100644
--- a/citadel-image/Cargo.toml
+++ b/citadel-image/Cargo.toml
@@ -3,6 +3,7 @@ name = "citadel-image"
 version = "0.1.0"
 authors = ["Bruce Leidl <bruce@subgraph.com>"]
 homepage = "https://github.com/subgraph/citadel"
+edition = "2018"
 
 [dependencies]
 libcitadel = { path = "../libcitadel" }
diff --git a/citadel-image/src/main.rs b/citadel-image/src/main.rs
index 993a6d0..3bd0bc7 100644
--- a/citadel-image/src/main.rs
+++ b/citadel-image/src/main.rs
@@ -2,9 +2,6 @@
 #[macro_use] extern crate failure;
 #[macro_use] extern crate serde_derive;
 
-extern crate clap;
-extern crate toml;
-
 use std::process::exit;
 use std::path::Path;
 
diff --git a/citadel-install/src/main.rs b/citadel-install/src/main.rs
index 5f4a704..545a94e 100644
--- a/citadel-install/src/main.rs
+++ b/citadel-install/src/main.rs
@@ -1,7 +1,4 @@
 #[macro_use] extern crate failure;
-extern crate libc;
-extern crate rpassword;
-extern crate libcitadel;
 
 mod installer;
 mod cli;
diff --git a/citadel-mount/src/main.rs b/citadel-mount/src/main.rs
index a831a8f..1822d29 100644
--- a/citadel-mount/src/main.rs
+++ b/citadel-mount/src/main.rs
@@ -1,8 +1,6 @@
 #[macro_use] extern crate failure;
 #[macro_use] extern crate libcitadel;
 
-extern crate libc;
-
 use std::process::exit;
 use std::env;
 use std::fs;
diff --git a/citadel-realms/src/main.rs b/citadel-realms/src/main.rs
index 97d7242..b1dd145 100644
--- a/citadel-realms/src/main.rs
+++ b/citadel-realms/src/main.rs
@@ -1,12 +1,6 @@
 #[macro_use] extern crate failure;
 #[macro_use] extern crate serde_derive;
 
-extern crate libc;
-extern crate clap;
-extern crate toml;
-extern crate termcolor;
-extern crate walkdir;
-
 use failure::Error;
 use clap::{App,Arg,ArgMatches,SubCommand};
 use clap::AppSettings::*;
diff --git a/libcitadel/src/lib.rs b/libcitadel/src/lib.rs
index 3c37ad0..e8f32ac 100644
--- a/libcitadel/src/lib.rs
+++ b/libcitadel/src/lib.rs
@@ -20,13 +20,6 @@ macro_rules! notify {
     ($fmt:expr, $($arg:tt)+) => { println!("[+] {}", format!($fmt, $($arg)+)); };
 }
 
-extern crate libc;
-extern crate serde;
-extern crate toml;
-extern crate ring;
-extern crate untrusted;
-extern crate rustc_serialize;
-
 use std::cell::RefCell;
 use std::result;