diff --git a/Cargo.lock b/Cargo.lock
index fcecf14132b5d..1f3f2bd54ce3b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -852,34 +852,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "data-encoding"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f47ca1860a761136924ddd2422ba77b2ea54fe8cc75b9040804a0d9d32ad97"
-
-[[package]]
-name = "data-encoding-macro"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1995a2e32b5306e4f49cf55ffcf4365a4dab2c7ca3a97163a4f099ec2fee3453"
-dependencies = [
- "data-encoding",
- "data-encoding-macro-internal",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "data-encoding-macro-internal"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd41a6f6a292f3d5be0cd1562bd6007652279d6afe3246f2722749e927338f7a"
-dependencies = [
- "data-encoding",
- "proc-macro-hack",
- "syn 0.15.44",
-]
-
 [[package]]
 name = "db-key"
 version = "0.0.5"
@@ -997,12 +969,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "endian-type"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
-
 [[package]]
 name = "enum-as-inner"
 version = "0.2.1"
@@ -1115,18 +1081,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
 [[package]]
 name = "file-source"
 version = "0.1.0"
@@ -2099,17 +2053,6 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
-[[package]]
-name = "libsqlite3-sys"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5b95e89c330291768dc840238db7f9e204fd208511ab6319b56193a7f2ae25"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "libz-sys"
 version = "1.0.25"
@@ -2688,12 +2631,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
 
-[[package]]
-name = "nibble_vec"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8d77f3db4bce033f4d04db08079b2ef1c3d02b44e86f25d08886fafa7756ffa"
-
 [[package]]
 name = "nix"
 version = "0.16.1"
@@ -3371,16 +3308,6 @@ dependencies = [
  "proc-macro2 1.0.8",
 ]
 
-[[package]]
-name = "radix_trie"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3681b28cd95acfb0560ea9441f82d6a4504fa3b15b97bd7b6e952131820e95"
-dependencies = [
- "endian-type",
- "nibble_vec",
-]
-
 [[package]]
 name = "rand"
 version = "0.4.6"
@@ -3965,21 +3892,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "rusqlite"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a194373ef527035645a1bc21b10dc2125f73497e6e155771233eb187aedd051"
-dependencies = [
- "bitflags",
- "fallible-iterator",
- "fallible-streaming-iterator",
- "libsqlite3-sys",
- "lru-cache",
- "memchr",
- "time 0.1.42",
-]
-
 [[package]]
 name = "rust-argon2"
 version = "0.7.0"
@@ -5476,34 +5388,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
 
-[[package]]
-name = "trust-dns"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f006aceba2c2dedfccede277aa03f74b25ff89ab53ceb1cc5889aea29d7e55f"
-dependencies = [
- "chrono",
- "data-encoding",
- "data-encoding-macro",
- "failure",
- "futures 0.1.29",
- "lazy_static",
- "log",
- "radix_trie",
- "rand 0.7.3",
- "tokio 0.1.22",
- "tokio-tcp",
- "tokio-udp",
- "trust-dns-proto",
-]
-
 [[package]]
 name = "trust-dns-proto"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05457ece29839d056d8cb66ec080209d34492b3d2e7e00641b486977be973db9"
 dependencies = [
- "data-encoding",
  "enum-as-inner",
  "failure",
  "futures 0.1.29",
@@ -5511,7 +5401,6 @@ dependencies = [
  "lazy_static",
  "log",
  "rand 0.7.3",
- "serde",
  "smallvec 0.6.13",
  "socket2",
  "tokio-executor",
@@ -5537,7 +5426,6 @@ dependencies = [
  "log",
  "lru-cache",
  "resolv-conf",
- "serde",
  "smallvec 0.6.13",
  "tokio 0.1.22",
  "tokio-executor",
@@ -5546,39 +5434,6 @@ dependencies = [
  "trust-dns-proto",
 ]
 
-[[package]]
-name = "trust-dns-server"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e526ea9c9203633a7818e9d459ff29a3fca050281f6de24db07d873f9d95792e"
-dependencies = [
- "backtrace",
- "bytes 0.4.12",
- "chrono",
- "clap",
- "enum-as-inner",
- "env_logger 0.6.2",
- "failure",
- "futures 0.1.29",
- "lazy_static",
- "log",
- "rand 0.7.3",
- "rusqlite",
- "serde",
- "time 0.1.42",
- "tokio 0.1.22",
- "tokio-executor",
- "tokio-io",
- "tokio-reactor",
- "tokio-tcp",
- "tokio-timer",
- "tokio-udp",
- "toml 0.5.6",
- "trust-dns",
- "trust-dns-proto",
- "trust-dns-resolver",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.2"
@@ -5904,9 +5759,6 @@ dependencies = [
  "tracing-log",
  "tracing-subscriber",
  "tracing-tower",
- "trust-dns",
- "trust-dns-proto",
- "trust-dns-server",
  "typetag",
  "url 1.7.2",
  "uuid 0.7.4",
diff --git a/Cargo.toml b/Cargo.toml
index b06b5dac9fa08..d9543b2b67e24 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,7 +43,7 @@ tracing-limit = { path = "lib/tracing-limit" }
 # Tokio / Futures
 futures01 = { package = "futures", version = "0.1.25" }
 futures = { version = "0.3", default-features = false, features = ["compat", "io-compat"] }
-tokio01 = { package = "tokio", version = "0.1.22", features = ["io", "uds", "tcp", "rt-full", "experimental-tracing"], default-features = false }
+tokio01 = { package = "tokio", version = "0.1.22", features = ["io", "uds", "tcp", "rt-full", "experimental-tracing", "codec", "udp"], default-features = false }
 tokio = { version = "0.2.13", features = ["blocking", "fs", "sync", "macros", "test-util", "rt-core", "io-std"] }
 tokio-codec = "0.1.2"
 tokio-openssl = "0.3.0"
@@ -194,9 +194,6 @@ tokio01-test = "0.1.1"
 tower-test03 = { package = "tower-test", version = "0.3" }
 tower-test01 = { package = "tower-test", version = "0.1" }
 serde_yaml = "0.8.9"
-trust-dns-server = "0.17.0"
-trust-dns = "0.17.0"
-trust-dns-proto = "0.8.0"
 dirs = "2.0.2"
 tokio-test = "0.2"
 tokio = { version = "0.2", features = ["test-util"] }