diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index 6470793a96..9a54ca3754 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -6,6 +6,7 @@ homepage = "https://github.com/holochain/holochain-rust"
 documentation = "https://github.com/holochain/holochain-rust"
 version = "0.0.42-alpha5"
 authors = ["Holochain Core Dev Team <devcore@holochain.org>"]
+edition = "2018"
 
 [dependencies]
 holochain_core_types = { version = "=0.0.42-alpha5", path = "../core_types" }
diff --git a/crates/cli/src/cli/chain_log.rs b/crates/cli/src/cli/chain_log.rs
index 30176da3bf..d1d1091f86 100644
--- a/crates/cli/src/cli/chain_log.rs
+++ b/crates/cli/src/cli/chain_log.rs
@@ -1,5 +1,6 @@
 use crate::error::DefaultResult;
 use colored::*;
+use failure::format_err;
 use holochain_core::{
     agent::{
         chain_store::ChainStore,
diff --git a/crates/cli/src/cli/generate.rs b/crates/cli/src/cli/generate.rs
index 69afe5d94f..4b7bb7dc39 100644
--- a/crates/cli/src/cli/generate.rs
+++ b/crates/cli/src/cli/generate.rs
@@ -1,4 +1,5 @@
 use crate::error::DefaultResult;
+use failure::format_err;
 use flate2::read::GzDecoder;
 use glob::glob;
 use std::{
diff --git a/crates/cli/src/cli/hash_dna.rs b/crates/cli/src/cli/hash_dna.rs
index d845551d55..3f615a10f8 100644
--- a/crates/cli/src/cli/hash_dna.rs
+++ b/crates/cli/src/cli/hash_dna.rs
@@ -1,4 +1,4 @@
-use error::DefaultResult;
+use crate::error::DefaultResult;
 use failure::err_msg;
 use holochain_conductor_lib::conductor::Conductor;
 use holochain_persistence_api::cas::content::{Address, AddressableContent};
diff --git a/crates/cli/src/cli/init.rs b/crates/cli/src/cli/init.rs
index 5cc9779f03..d682179cf0 100644
--- a/crates/cli/src/cli/init.rs
+++ b/crates/cli/src/cli/init.rs
@@ -8,6 +8,7 @@ use crate::{
     util::DIST_DIR_NAME,
 };
 use colored::*;
+use failure::bail;
 use serde_json;
 use std::{
     collections::HashMap,
@@ -138,9 +139,9 @@ pub fn init(path: &PathBuf) -> DefaultResult<()> {
 
 #[cfg(test)]
 pub mod tests {
-    use super::*;
-    extern crate tempfile;
     use self::tempfile::{Builder, TempDir};
+    use super::*;
+    use tempfile;
 
     const HOLOCHAIN_TEST_PREFIX: &str = "org_holochain_test";
 
diff --git a/crates/cli/src/cli/keygen.rs b/crates/cli/src/cli/keygen.rs
index 3cd89871ad..0943683098 100644
--- a/crates/cli/src/cli/keygen.rs
+++ b/crates/cli/src/cli/keygen.rs
@@ -1,4 +1,4 @@
-use error::DefaultResult;
+use crate::error::DefaultResult;
 use holochain_common::paths::keys_directory;
 use holochain_conductor_lib::{key_loaders::mock_passphrase_manager, keystore::Keystore};
 use rpassword;
diff --git a/crates/cli/src/cli/package.rs b/crates/cli/src/cli/package.rs
index 364b6b3fe9..a50bdd9a41 100644
--- a/crates/cli/src/cli/package.rs
+++ b/crates/cli/src/cli/package.rs
@@ -1,13 +1,14 @@
 use crate::{config_files::Build, error::DefaultResult, util};
 use base64;
 use colored::*;
+use failure::format_err;
 use holochain_core::nucleus::ribosome::{run_dna, WasmCallData};
 use holochain_core_types::dna::Dna;
 use holochain_json_api::json::JsonString;
 use holochain_persistence_api::cas::content::AddressableContent;
 use ignore::WalkBuilder;
 use json_patch::merge;
-use serde_json::{self, Map, Value};
+use serde_json::{self, json, Map, Value};
 use std::{
     convert::TryFrom,
     fs::{self, File},
diff --git a/crates/cli/src/cli/run.rs b/crates/cli/src/cli/run.rs
index 1c00ffd9c5..5471db6a01 100644
--- a/crates/cli/src/cli/run.rs
+++ b/crates/cli/src/cli/run.rs
@@ -1,7 +1,6 @@
-use crate::NetworkingType;
-use cli;
+use crate::{cli, error::DefaultResult, NetworkingType};
 use colored::*;
-use error::DefaultResult;
+use failure::format_err;
 use holochain_common::env_vars::EnvVar;
 use holochain_conductor_lib::{
     conductor::{mount_conductor_from_config, Conductor, CONDUCTOR},
@@ -14,6 +13,7 @@ use holochain_conductor_lib::{
 use holochain_core_types::agent::AgentId;
 use holochain_net::sim2h_worker::Sim2hConfig;
 use holochain_persistence_api::cas::content::AddressableContent;
+use serde_json::json;
 use std::{fs, path::PathBuf};
 
 pub enum Networking {
@@ -284,7 +284,7 @@ impl Networking {
 
 #[cfg(test)]
 mod tests {
-    extern crate tempfile;
+    use tempfile;
     // use crate::cli::init::{init, tests::gen_dir};
     // use assert_cmd::prelude::*;
     // use std::{env, process::Command, path::PathBuf};
diff --git a/crates/cli/src/cli/test.rs b/crates/cli/src/cli/test.rs
index 08bbc1433b..7d12572cc2 100644
--- a/crates/cli/src/cli/test.rs
+++ b/crates/cli/src/cli/test.rs
@@ -1,6 +1,7 @@
 use crate::{cli::package, error::DefaultResult, util};
 use colored::*;
-use failure::Error;
+use failure::{ensure, Error};
+use serde_json::json;
 use std::{
     io::ErrorKind,
     path::PathBuf,
diff --git a/crates/cli/src/config_files/app.rs b/crates/cli/src/config_files/app.rs
index 2fb891e18c..0edc0bf160 100644
--- a/crates/cli/src/config_files/app.rs
+++ b/crates/cli/src/config_files/app.rs
@@ -1,5 +1,6 @@
 use crate::config_files::Dht;
 use semver::Version;
+use serde_derive::{Deserialize, Serialize};
 use serde_json::Value;
 
 #[derive(Serialize, Deserialize, Clone)]
diff --git a/crates/cli/src/config_files/build.rs b/crates/cli/src/config_files/build.rs
index 85e1fc7e06..77179bd28f 100644
--- a/crates/cli/src/config_files/build.rs
+++ b/crates/cli/src/config_files/build.rs
@@ -1,5 +1,7 @@
 use crate::{error::DefaultResult, util};
 use base64;
+use failure::bail;
+use serde_derive::{Deserialize, Serialize};
 use serde_json;
 use std::{
     fs::File,
diff --git a/crates/cli/src/config_files/dht.rs b/crates/cli/src/config_files/dht.rs
index 316507fed4..1be5b4c8a5 100644
--- a/crates/cli/src/config_files/dht.rs
+++ b/crates/cli/src/config_files/dht.rs
@@ -1,2 +1,4 @@
+use serde_derive::{Deserialize, Serialize};
+
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Dht {}
diff --git a/crates/cli/src/error.rs b/crates/cli/src/error.rs
index bf284f6ac3..17090986c8 100644
--- a/crates/cli/src/error.rs
+++ b/crates/cli/src/error.rs
@@ -1,4 +1,4 @@
-use failure::Error;
+use failure::{format_err, Error, Fail};
 
 #[derive(Debug, Fail)]
 pub enum HolochainError {
diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index 6ed4bef125..e2b5591edd 100755
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -1,49 +1,17 @@
-#![warn(unused_extern_crates)]
-extern crate holochain_common;
-extern crate holochain_conductor_lib;
-extern crate holochain_core;
-extern crate holochain_core_types;
-extern crate holochain_json_api;
-extern crate holochain_locksmith;
-extern crate holochain_net;
-extern crate holochain_persistence_api;
-extern crate holochain_persistence_file;
-extern crate json_patch;
-extern crate lib3h_crypto_api;
-extern crate lib3h_protocol;
-extern crate lib3h_sodium;
-extern crate sim2h;
-extern crate structopt;
-#[macro_use]
-extern crate failure;
-#[macro_use]
-extern crate serde_derive;
-extern crate base64;
-extern crate colored;
-extern crate semver;
-#[macro_use]
-extern crate serde_json;
-extern crate dns_lookup;
-extern crate flate2;
-extern crate glob;
-extern crate ignore;
-extern crate in_stream;
-extern crate rpassword;
-extern crate tar;
-extern crate tempfile;
-extern crate tera;
-extern crate url2;
+use crate::error::{HolochainError, HolochainResult};
+use failure::format_err;
+use holochain_common;
+use holochain_conductor_lib::happ_bundle::HappBundle;
+use lib3h_sodium;
+use serde_json::json;
+use std::{fs::File, io::Read, path::PathBuf, str::FromStr};
+use structopt::{clap::arg_enum, StructOpt};
 
 mod cli;
 mod config_files;
 mod error;
 mod util;
 
-use crate::error::{HolochainError, HolochainResult};
-use holochain_conductor_lib::happ_bundle::HappBundle;
-use std::{fs::File, io::Read, path::PathBuf, str::FromStr};
-use structopt::{clap::arg_enum, StructOpt};
-
 #[derive(StructOpt)]
 /// A command line for Holochain
 enum Cli {
diff --git a/crates/cli/src/util.rs b/crates/cli/src/util.rs
index 6f82223f79..cda627c4d3 100644
--- a/crates/cli/src/util.rs
+++ b/crates/cli/src/util.rs
@@ -1,5 +1,6 @@
 use crate::error::DefaultResult;
 use colored::*;
+use failure::{ensure, format_err};
 pub use holochain_common::paths::DNA_EXTENSION;
 use std::{
     fs,