diff --git a/Cargo.lock b/Cargo.lock
index 2df442d..1a99876 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,14 +8,6 @@ dependencies = [
  "gimli 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "aho-corasick"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "0.7.10"
@@ -24,19 +16,6 @@ dependencies = [
  "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "amq-proto"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "amq-protocol"
 version = "6.0.0-rc7"
@@ -91,19 +70,6 @@ dependencies = [
  "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "amqp"
-version = "0.1.0"
-source = "git+https://github.com/grahamc/rust-amqp.git#b58edf8822072688d882966f7427f0a9e67aee78"
-dependencies = [
- "amq-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "ansi_term"
 version = "0.11.0"
@@ -189,16 +155,6 @@ name = "base64"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "bit-vec"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bitflags"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "bitflags"
 version = "1.2.1"
@@ -233,11 +189,6 @@ name = "byte-tools"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "byteorder"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "byteorder"
 version = "1.3.4"
@@ -276,15 +227,6 @@ name = "cookie-factory"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "core-foundation"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.7.0"
@@ -294,14 +236,6 @@ dependencies = [
  "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "core-foundation-sys"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.7.0"
@@ -390,23 +324,6 @@ name = "either"
 version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "enum_primitive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "error-chain"
 version = "0.10.0"
@@ -608,12 +525,12 @@ dependencies = [
 
 [[package]]
 name = "hyper-native-tls"
-version = "0.2.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -688,11 +605,6 @@ dependencies = [
  "serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "lazy_static"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -780,14 +692,6 @@ name = "md5"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "memchr"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "memchr"
 version = "2.3.3"
@@ -831,20 +735,6 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "schannel 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.4"
@@ -910,14 +800,6 @@ dependencies = [
  "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "num-traits"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.11"
@@ -944,14 +826,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "ofborg"
 version = "0.1.9"
 dependencies = [
- "amqp 0.1.0 (git+https://github.com/grahamc/rust-amqp.git)",
  "async-std 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "hubcaps 0.3.16 (git+https://github.com/grahamc/hubcaps.git)",
  "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lapin 1.0.0-rc6 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "md5 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -985,18 +866,6 @@ name = "opaque-debug"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "openssl"
-version = "0.9.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.57 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "openssl"
 version = "0.10.29"
@@ -1272,18 +1141,6 @@ name = "redox_syscall"
 version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "regex"
-version = "0.1.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "regex"
 version = "1.3.7"
@@ -1304,11 +1161,6 @@ dependencies = [
  "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "regex-syntax"
 version = "0.6.17"
@@ -1356,17 +1208,6 @@ name = "scopeguard"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "security-framework"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "security-framework"
 version = "0.4.4"
@@ -1379,15 +1220,6 @@ dependencies = [
  "security-framework-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "security-framework-sys"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "security-framework-sys"
 version = "0.4.3"
@@ -1528,15 +1360,6 @@ dependencies = [
  "pem 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tempdir"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "tempfile"
 version = "2.2.0"
@@ -1562,23 +1385,6 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "thread-id"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "thread_local"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "thread_local"
 version = "1.0.1"
@@ -1731,11 +1537,6 @@ dependencies = [
  "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "utf8-ranges"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "uuid"
 version = "0.4.0"
@@ -1886,15 +1687,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
 "checksum addr2line 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543"
-"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
 "checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
-"checksum amq-proto 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "66d79639b71f74c7006c12683cc2ff221615a51a741688fa7798ccd080dc54d3"
 "checksum amq-protocol 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)" = "f107cf5f6960ae3ddf1c5b5dea85a68a4f6d70c51ae66b8df86180860145da1b"
 "checksum amq-protocol-codegen 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f51a7891d6185faa895186b2a604ce9618088626bb2097f09fcb28bfc102636"
 "checksum amq-protocol-tcp 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)" = "b60861763928b4776f3b129595a13caf9caa533e89ed98436613c49d5041d887"
 "checksum amq-protocol-types 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)" = "00e2c0836916200c43f462f35dea50b520a551c4d755e07492e389b19befba95"
 "checksum amq-protocol-uri 6.0.0-rc7 (registry+https://github.com/rust-lang/crates.io-index)" = "7b891342708e4ed231278ef5bb8ccccf6ca1542fc56d02e7a1cff548ac2ad215"
-"checksum amqp 0.1.0 (git+https://github.com/grahamc/rust-amqp.git)" = "<none>"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
 "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
@@ -1905,23 +1703,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
 "checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
-"checksum bit-vec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
-"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 "checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
 "checksum bumpalo 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5356f1d23ee24a1f785a56d1d1a5f0fd5b0f6a0c0fb2412ce11da71649ab78f6"
 "checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-"checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 "checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 "checksum cc 1.0.54 (registry+https://github.com/rust-lang/crates.io-index)" = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 "checksum chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum cookie-factory 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "41f21b581d2f0cb891554812435667bb9610d74feb1a4c6415bf09c28ff0381d"
-"checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
 "checksum core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
-"checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
 "checksum core-foundation-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
 "checksum crossbeam 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
 "checksum crossbeam-channel 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061"
@@ -1932,8 +1725,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 "checksum doc-comment 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-"checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180"
-"checksum env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f"
 "checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
 "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
@@ -1957,7 +1748,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum hubcaps 0.3.16 (git+https://github.com/grahamc/hubcaps.git)" = "<none>"
 "checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
-"checksum hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "72332e4a35d3059583623b50e98e491b78f8b96c5521fcb3f428167955aa56e8"
+"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
 "checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
@@ -1966,7 +1757,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum kv-log-macro 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4ff57d6d215f7ca7eb35a9a64d656ba4d9d2bef114d741dc08048e75e2f5d418"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lapin 1.0.0-rc6 (registry+https://github.com/rust-lang/crates.io-index)" = "6fcc19a0b0a5c9de7fd25ec93a590ab0c12780729fb72cf68ecb8fc08b1005e3"
-"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum lexical-core 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
 "checksum libc 0.2.70 (registry+https://github.com/rust-lang/crates.io-index)" = "3baa92041a6fec78c687fa0cc2b3fae8884f743d672cf551bed1d6dac6988d0f"
@@ -1980,27 +1770,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 "checksum md5 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "79c56d6a0b07f9e19282511c83fc5b086364cbae4ba8c7d5f190c3d9b0425a48"
-"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
 "checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 "checksum memoffset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
 "checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
 "checksum mio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6e9971bc8349a361217a8f2a41f5d011274686bd4436465ba51730921039d7fb"
 "checksum miow 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "22dfdd1d51b2639a5abd17ed07005c3af05fb7a2a3b1a1d0d7af1000a520c1c7"
-"checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0"
 "checksum native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
 "checksum nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
 "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
 "checksum nom 6.0.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)" = "25020779544bf717b917323b42f23c9dbef1bd2b97b576df6484a0c8709705c6"
 "checksum ntapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2"
 "checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
-"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 "checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
 "checksum num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
 "checksum object 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2"
 "checksum once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
 "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 "checksum openssl 0.10.29 (registry+https://github.com/rust-lang/crates.io-index)" = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd"
-"checksum openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "a3605c298474a3aa69de92d21139fb5e2a81688d308262359d85cdd0d12a7985"
 "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 "checksum openssl-sys 0.9.57 (registry+https://github.com/rust-lang/crates.io-index)" = "7410fef80af8ac071d4f63755c0ab89ac3df0fd1ea91f1d1f37cf5cec4395990"
 "checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
@@ -2033,10 +1819,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
 "checksum regex 1.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692"
 "checksum regex-automata 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
-"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
 "checksum regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
@@ -2045,9 +1829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum schannel 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
 "checksum scoped-tls-hkt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c2e9d7eaddb227e8fbaaa71136ae0e1e913ca159b86c7da82f3e8f0044ad3a63"
 "checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332"
 "checksum security-framework 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535"
-"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead"
 "checksum security-framework-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
 "checksum send_wrapper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 "checksum separator 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5"
@@ -2064,11 +1846,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum syn 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)" = "95b5f192649e48a5302a13f2feb224df883b98933222369e4b3b0fe2a5447269"
 "checksum sys-info 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "58283a48c9212afcade2069f8bbf7ded6a7bdbf4888d2defba72244c8e5f423c"
 "checksum tcp-stream 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3bf936a66fc83b53e50a754b2dc3ca607c1149710b5e96f0546e053a9764303e"
-"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
 "checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
-"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 "checksum time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
 "checksum tracing 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c6b59d116d218cb2d990eb06b77b64043e0268ef7323aae63d8b30ae462923"
@@ -2087,7 +1866,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 "checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
-"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
 "checksum uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7cfec50b0842181ba6e713151b72f4ec84a6a7e2c9c8a8a3ffc37bb1cd16b231"
 "checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
diff --git a/Cargo.nix b/Cargo.nix
index 9a6e57e..115618d 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -95,25 +95,7 @@ rec {
           "std-object" = [ "std" "object" "object/std" "object/compression" "gimli/endian-reader" ];
         };
       };
-      "aho-corasick 0.5.3" = rec {
-        crateName = "aho-corasick";
-        version = "0.5.3";
-        edition = "2015";
-        crateBin = [];
-        sha256 = "0rnvdmlajikq0i4zdy1p3pv699q6apvsxfc7av7byhppllp2r5ya";
-        libName = "aho_corasick";
-        authors = [
-          "Andrew Gallant <jamslam@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "memchr";
-            packageId = "memchr 0.1.11";
-          }
-        ];
-        
-      };
-      "aho-corasick 0.7.10" = rec {
+      "aho-corasick" = rec {
         crateName = "aho-corasick";
         version = "0.7.10";
         edition = "2015";
@@ -125,7 +107,7 @@ rec {
         dependencies = [
           {
             name = "memchr";
-            packageId = "memchr 2.3.3";
+            packageId = "memchr";
             usesDefaultFeatures = false;
           }
         ];
@@ -135,42 +117,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "std" ];
       };
-      "amq-proto" = rec {
-        crateName = "amq-proto";
-        version = "0.1.0";
-        edition = "2015";
-        sha256 = "1lslvj0d1k4qfzx8h5kl3ajia5i2zz13qs0jdh0cfx0znwwrdmv6";
-        authors = [
-          "Andrii Dmytrenko <refresh.xss@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "bit-vec";
-            packageId = "bit-vec";
-          }
-          {
-            name = "byteorder";
-            packageId = "byteorder 0.5.3";
-          }
-          {
-            name = "enum_primitive";
-            packageId = "enum_primitive";
-          }
-          {
-            name = "env_logger";
-            packageId = "env_logger";
-          }
-          {
-            name = "error-chain";
-            packageId = "error-chain";
-          }
-          {
-            name = "log";
-            packageId = "log 0.3.9";
-          }
-        ];
-        
-      };
       "amq-protocol" = rec {
         crateName = "amq-protocol";
         version = "6.0.0-rc7";
@@ -343,52 +289,6 @@ rec {
         ];
         
       };
-      "amqp" = rec {
-        crateName = "amqp";
-        version = "0.1.0";
-        edition = "2015";
-        workspace_member = null;
-        src = pkgs.fetchgit {
-          url = "https://github.com/grahamc/rust-amqp.git";
-          rev = "b58edf8822072688d882966f7427f0a9e67aee78";
-          sha256 = "0a0n8h71lnsl2rbi6v1zmy015f7hl91y5mgx3qzxlfrn3pjz8sy1";
-        };
-        authors = [
-          "Andrii Dmytrenko <andrey@reevoo.com>"
-        ];
-        dependencies = [
-          {
-            name = "amq-proto";
-            packageId = "amq-proto";
-          }
-          {
-            name = "env_logger";
-            packageId = "env_logger";
-          }
-          {
-            name = "log";
-            packageId = "log 0.3.9";
-          }
-          {
-            name = "openssl";
-            packageId = "openssl 0.9.24";
-            optional = true;
-          }
-          {
-            name = "time";
-            packageId = "time";
-          }
-          {
-            name = "url";
-            packageId = "url 1.7.2";
-          }
-        ];
-        features = {
-          "default" = [ "tls" ];
-          "tls" = [ "openssl" ];
-        };
-        resolvedDefaultFeatures = [ "default" "openssl" "tls" ];
-      };
       "ansi_term" = rec {
         crateName = "ansi_term";
         version = "0.11.0";
@@ -491,7 +391,7 @@ rec {
           }
           {
             name = "memchr";
-            packageId = "memchr 2.3.3";
+            packageId = "memchr";
             optional = true;
           }
           {
@@ -624,7 +524,7 @@ rec {
         dependencies = [
           {
             name = "byteorder";
-            packageId = "byteorder 1.3.4";
+            packageId = "byteorder";
           }
         ];
         
@@ -655,7 +555,7 @@ rec {
         dependencies = [
           {
             name = "byteorder";
-            packageId = "byteorder 1.3.4";
+            packageId = "byteorder";
           }
           {
             name = "safemem";
@@ -664,31 +564,7 @@ rec {
         ];
         
       };
-      "bit-vec" = rec {
-        crateName = "bit-vec";
-        version = "0.4.4";
-        edition = "2015";
-        sha256 = "0pw902a8ail0k64a7092a8vngfzsq7xkj2r22hz6q1z62s5zzd02";
-        authors = [
-          "Alexis Beingessner <a.beingessner@gmail.com>"
-        ];
-        features = {
-        };
-      };
-      "bitflags 0.9.1" = rec {
-        crateName = "bitflags";
-        version = "0.9.1";
-        edition = "2015";
-        sha256 = "19dk39gfwmhi3iy1x0wgml1fv1bkb525ywy25zwihbm063i05zaf";
-        authors = [
-          "The Rust Project Developers"
-        ];
-        features = {
-          "default" = [ "example_generated" ];
-        };
-        resolvedDefaultFeatures = [ "default" "example_generated" ];
-      };
-      "bitflags 1.2.1" = rec {
+      "bitflags" = rec {
         crateName = "bitflags";
         version = "1.2.1";
         edition = "2015";
@@ -719,7 +595,7 @@ rec {
           }
           {
             name = "byteorder";
-            packageId = "byteorder 1.3.4";
+            packageId = "byteorder";
             usesDefaultFeatures = false;
           }
           {
@@ -767,20 +643,7 @@ rec {
         ];
         
       };
-      "byteorder 0.5.3" = rec {
-        crateName = "byteorder";
-        version = "0.5.3";
-        edition = "2015";
-        sha256 = "0ma8pkyz1jbglr29m1yzlc9ghmv6672nvsrn7zd0yn5jqs60xh8g";
-        authors = [
-          "Andrew Gallant <jamslam@gmail.com>"
-        ];
-        features = {
-          "default" = [ "std" ];
-        };
-        resolvedDefaultFeatures = [ "default" "std" ];
-      };
-      "byteorder 1.3.4" = rec {
+      "byteorder" = rec {
         crateName = "byteorder";
         version = "1.3.4";
         edition = "2015";
@@ -835,7 +698,7 @@ rec {
           }
           {
             name = "num-traits";
-            packageId = "num-traits 0.2.11";
+            packageId = "num-traits";
             usesDefaultFeatures = false;
           }
           {
@@ -863,7 +726,7 @@ rec {
         dependencies = [
           {
             name = "bitflags";
-            packageId = "bitflags 1.2.1";
+            packageId = "bitflags";
             optional = true;
           }
         ];
@@ -886,27 +749,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "std" ];
       };
-      "core-foundation 0.2.3" = rec {
-        crateName = "core-foundation";
-        version = "0.2.3";
-        edition = "2015";
-        sha256 = "0rvcn7ab5r69wvn7gby745jlpy8pirfywcdxbiypy083s93dggr5";
-        authors = [
-          "The Servo Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "core-foundation-sys";
-            packageId = "core-foundation-sys 0.2.3";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-        ];
-        
-      };
-      "core-foundation 0.7.0" = rec {
+      "core-foundation" = rec {
         crateName = "core-foundation";
         version = "0.7.0";
         edition = "2015";
@@ -917,7 +760,7 @@ rec {
         dependencies = [
           {
             name = "core-foundation-sys";
-            packageId = "core-foundation-sys 0.7.0";
+            packageId = "core-foundation-sys";
           }
           {
             name = "libc";
@@ -931,23 +774,7 @@ rec {
           "with-uuid" = [ "uuid" ];
         };
       };
-      "core-foundation-sys 0.2.3" = rec {
-        crateName = "core-foundation-sys";
-        version = "0.2.3";
-        edition = "2015";
-        sha256 = "13f7f3kblyj6yxcxm74yg84vj9ahaprlc1vgblagmj6bzmzmsnh6";
-        authors = [
-          "The Servo Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-        ];
-        
-      };
-      "core-foundation-sys 0.7.0" = rec {
+      "core-foundation-sys" = rec {
         crateName = "core-foundation-sys";
         version = "0.7.0";
         edition = "2015";
@@ -1069,7 +896,7 @@ rec {
           }
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
             optional = true;
           }
           {
@@ -1141,7 +968,7 @@ rec {
           }
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
             optional = true;
           }
         ];
@@ -1200,47 +1027,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "use_std" ];
       };
-      "enum_primitive" = rec {
-        crateName = "enum_primitive";
-        version = "0.1.1";
-        edition = "2015";
-        sha256 = "100ip2p3w1rq0clca2ai5shhvpxfipnsjncj0f9ralad5w4m2idy";
-        authors = [
-          "Anders Kaseorg <andersk@mit.edu>"
-        ];
-        dependencies = [
-          {
-            name = "num-traits";
-            packageId = "num-traits 0.1.43";
-            usesDefaultFeatures = false;
-          }
-        ];
-        
-      };
-      "env_logger" = rec {
-        crateName = "env_logger";
-        version = "0.3.5";
-        edition = "2015";
-        sha256 = "0bvcjgkw4s3k1rd7glpflgc8s9a393zjd6jfdgvs8gjvwj0dgaqm";
-        authors = [
-          "The Rust Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "log";
-            packageId = "log 0.3.9";
-          }
-          {
-            name = "regex";
-            packageId = "regex 0.1.80";
-            optional = true;
-          }
-        ];
-        features = {
-          "default" = [ "regex" ];
-        };
-        resolvedDefaultFeatures = [ "default" "regex" ];
-      };
       "error-chain" = rec {
         crateName = "error-chain";
         version = "0.10.0";
@@ -1315,7 +1101,7 @@ rec {
           }
           {
             name = "openssl";
-            packageId = "openssl 0.10.29";
+            packageId = "openssl";
           }
           {
             name = "serde";
@@ -1504,7 +1290,7 @@ rec {
           }
           {
             name = "memchr";
-            packageId = "memchr 2.3.3";
+            packageId = "memchr";
             optional = true;
           }
           {
@@ -1823,9 +1609,9 @@ rec {
       };
       "hyper-native-tls" = rec {
         crateName = "hyper-native-tls";
-        version = "0.2.4";
+        version = "0.3.0";
         edition = "2015";
-        sha256 = "1s2nm9apj5i8yjrzq8amdjwzhy0v967fjl1vca1ra1fk6m52wcvj";
+        sha256 = "0s30y20qy0akzss91yxsq1x1q7rr04jy33i0cq72nx22yjc5advd";
         authors = [
           "Steven Fackler <sfackler@gmail.com>"
         ];
@@ -1840,7 +1626,7 @@ rec {
           }
           {
             name = "native-tls";
-            packageId = "native-tls 0.1.5";
+            packageId = "native-tls";
           }
         ];
         
@@ -2039,20 +1825,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "native-tls" ];
       };
-      "lazy_static 0.2.11" = rec {
-        crateName = "lazy_static";
-        version = "0.2.11";
-        edition = "2015";
-        sha256 = "0wxy8vak7jsx6r8gx475pjqpx11p2bfq4wvw6idmqi31mp3k7w3n";
-        authors = [
-          "Marvin Löbel <loebel.marvin@gmail.com>"
-        ];
-        features = {
-          "compiletest" = [ "compiletest_rs" ];
-          "spin_no_std" = [ "nightly" "spin" ];
-        };
-      };
-      "lazy_static 1.4.0" = rec {
+      "lazy_static" = rec {
         crateName = "lazy_static";
         version = "1.4.0";
         edition = "2015";
@@ -2081,7 +1854,7 @@ rec {
           }
           {
             name = "bitflags";
-            packageId = "bitflags 1.2.1";
+            packageId = "bitflags";
           }
           {
             name = "cfg-if";
@@ -2286,24 +2059,7 @@ rec {
         ];
         
       };
-      "memchr 0.1.11" = rec {
-        crateName = "memchr";
-        version = "0.1.11";
-        edition = "2015";
-        sha256 = "084d85hjfa3xf5kwdms2mhbkh78m1gl2254cp5swcxj3a7xjkdnq";
-        authors = [
-          "Andrew Gallant <jamslam@gmail.com>"
-          "bluss"
-        ];
-        dependencies = [
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-        ];
-        
-      };
-      "memchr 2.3.3" = rec {
+      "memchr" = rec {
         crateName = "memchr";
         version = "2.3.3";
         edition = "2015";
@@ -2365,7 +2121,7 @@ rec {
         dependencies = [
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
             target = { target, features }: target."windows";
           }
           {
@@ -2419,54 +2175,7 @@ rec {
         ];
         
       };
-      "native-tls 0.1.5" = rec {
-        crateName = "native-tls";
-        version = "0.1.5";
-        edition = "2015";
-        sha256 = "1h7v80nlskyr7b1gsg4ivlpm6pilj6ybgvcwadj7ips3igfblkgp";
-        authors = [
-          "Steven Fackler <sfackler@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "lazy_static";
-            packageId = "lazy_static 0.2.11";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-            target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
-          }
-          {
-            name = "openssl";
-            packageId = "openssl 0.9.24";
-            target = { target, features }: (!((target."os" == "windows") || (target."os" == "macos") || (target."os" == "ios")));
-          }
-          {
-            name = "schannel";
-            packageId = "schannel";
-            target = { target, features }: (target."os" == "windows");
-          }
-          {
-            name = "security-framework";
-            packageId = "security-framework 0.1.16";
-            target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
-            features = [ "OSX_10_8" ];
-          }
-          {
-            name = "security-framework-sys";
-            packageId = "security-framework-sys 0.1.16";
-            target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
-          }
-          {
-            name = "tempdir";
-            packageId = "tempdir";
-            target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
-          }
-        ];
-        
-      };
-      "native-tls 0.2.4" = rec {
+      "native-tls" = rec {
         crateName = "native-tls";
         version = "0.2.4";
         edition = "2015";
@@ -2477,7 +2186,7 @@ rec {
         dependencies = [
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
             target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
           }
           {
@@ -2492,7 +2201,7 @@ rec {
           }
           {
             name = "openssl";
-            packageId = "openssl 0.10.29";
+            packageId = "openssl";
             target = { target, features }: (!((target."os" == "windows") || (target."os" == "macos") || (target."os" == "ios")));
           }
           {
@@ -2512,12 +2221,12 @@ rec {
           }
           {
             name = "security-framework";
-            packageId = "security-framework 0.4.4";
+            packageId = "security-framework";
             target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
           }
           {
             name = "security-framework-sys";
-            packageId = "security-framework-sys 0.4.3";
+            packageId = "security-framework-sys";
             target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
           }
           {
@@ -2541,7 +2250,7 @@ rec {
         dependencies = [
           {
             name = "bitflags";
-            packageId = "bitflags 1.2.1";
+            packageId = "bitflags";
           }
           {
             name = "cfg-if";
@@ -2577,7 +2286,7 @@ rec {
         dependencies = [
           {
             name = "memchr";
-            packageId = "memchr 2.3.3";
+            packageId = "memchr";
             usesDefaultFeatures = false;
           }
         ];
@@ -2612,7 +2321,7 @@ rec {
           }
           {
             name = "memchr";
-            packageId = "memchr 2.3.3";
+            packageId = "memchr";
             usesDefaultFeatures = false;
           }
         ];
@@ -2662,7 +2371,7 @@ rec {
         dependencies = [
           {
             name = "num-traits";
-            packageId = "num-traits 0.2.11";
+            packageId = "num-traits";
             usesDefaultFeatures = false;
           }
         ];
@@ -2678,23 +2387,7 @@ rec {
           "std" = [ "num-traits/std" ];
         };
       };
-      "num-traits 0.1.43" = rec {
-        crateName = "num-traits";
-        version = "0.1.43";
-        edition = "2015";
-        sha256 = "0c9whknf2dm74a3cqirafy6gj83a76gl56g4v3g19k6lkwz13rcj";
-        authors = [
-          "The Rust Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "num-traits";
-            packageId = "num-traits 0.2.11";
-          }
-        ];
-        
-      };
-      "num-traits 0.2.11" = rec {
+      "num-traits" = rec {
         crateName = "num-traits";
         version = "0.2.11";
         edition = "2015";
@@ -2711,7 +2404,6 @@ rec {
         features = {
           "default" = [ "std" ];
         };
-        resolvedDefaultFeatures = [ "default" "std" ];
       };
       "num_cpus" = rec {
         crateName = "num_cpus";
@@ -2774,10 +2466,6 @@ rec {
           "Graham Christensen <graham@grahamc.com>"
         ];
         dependencies = [
-          {
-            name = "amqp";
-            packageId = "amqp";
-          }
           {
             name = "async-std";
             packageId = "async-std";
@@ -2909,7 +2597,7 @@ rec {
         ];
         
       };
-      "openssl 0.10.29" = rec {
+      "openssl" = rec {
         crateName = "openssl";
         version = "0.10.29";
         edition = "2015";
@@ -2920,7 +2608,7 @@ rec {
         dependencies = [
           {
             name = "bitflags";
-            packageId = "bitflags 1.2.1";
+            packageId = "bitflags";
           }
           {
             name = "cfg-if";
@@ -2932,7 +2620,7 @@ rec {
           }
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
           }
           {
             name = "libc";
@@ -2947,39 +2635,6 @@ rec {
           "vendored" = [ "openssl-sys/vendored" ];
         };
       };
-      "openssl 0.9.24" = rec {
-        crateName = "openssl";
-        version = "0.9.24";
-        edition = "2015";
-        sha256 = "11br5b8x1kc5klsn50ihiml82ajyzcwi3lljvrlsm8vlhhlmqq53";
-        authors = [
-          "Steven Fackler <sfackler@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "bitflags";
-            packageId = "bitflags 0.9.1";
-          }
-          {
-            name = "foreign-types";
-            packageId = "foreign-types";
-          }
-          {
-            name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-          {
-            name = "openssl-sys";
-            packageId = "openssl-sys";
-          }
-        ];
-        features = {
-        };
-      };
       "openssl-probe" = rec {
         crateName = "openssl-probe";
         version = "0.1.2";
@@ -3113,11 +2768,11 @@ rec {
           }
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
           }
           {
             name = "regex";
-            packageId = "regex 1.3.7";
+            packageId = "regex";
           }
         ];
         
@@ -3696,41 +3351,7 @@ rec {
         ];
         
       };
-      "regex 0.1.80" = rec {
-        crateName = "regex";
-        version = "0.1.80";
-        edition = "2015";
-        sha256 = "0bs036h3vzc6pj5jj4vc909s9rppq7b808ic99qn0y6gm3karm2g";
-        authors = [
-          "The Rust Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "aho-corasick";
-            packageId = "aho-corasick 0.5.3";
-          }
-          {
-            name = "memchr";
-            packageId = "memchr 0.1.11";
-          }
-          {
-            name = "regex-syntax";
-            packageId = "regex-syntax 0.3.9";
-          }
-          {
-            name = "thread_local";
-            packageId = "thread_local 0.2.7";
-          }
-          {
-            name = "utf8-ranges";
-            packageId = "utf8-ranges";
-          }
-        ];
-        features = {
-          "simd-accel" = [ "simd" ];
-        };
-      };
-      "regex 1.3.7" = rec {
+      "regex" = rec {
         crateName = "regex";
         version = "1.3.7";
         edition = "2015";
@@ -3741,22 +3362,22 @@ rec {
         dependencies = [
           {
             name = "aho-corasick";
-            packageId = "aho-corasick 0.7.10";
+            packageId = "aho-corasick";
             optional = true;
           }
           {
             name = "memchr";
-            packageId = "memchr 2.3.3";
+            packageId = "memchr";
             optional = true;
           }
           {
             name = "regex-syntax";
-            packageId = "regex-syntax 0.6.17";
+            packageId = "regex-syntax";
             usesDefaultFeatures = false;
           }
           {
             name = "thread_local";
-            packageId = "thread_local 1.0.1";
+            packageId = "thread_local";
             optional = true;
           }
         ];
@@ -3789,12 +3410,12 @@ rec {
         dependencies = [
           {
             name = "byteorder";
-            packageId = "byteorder 1.3.4";
+            packageId = "byteorder";
             usesDefaultFeatures = false;
           }
           {
             name = "regex-syntax";
-            packageId = "regex-syntax 0.6.17";
+            packageId = "regex-syntax";
             optional = true;
           }
         ];
@@ -3805,17 +3426,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "regex-syntax" "std" ];
       };
-      "regex-syntax 0.3.9" = rec {
-        crateName = "regex-syntax";
-        version = "0.3.9";
-        edition = "2015";
-        sha256 = "0ms9hgdhhsxw9w920i7gipydvagf100bb56jbs192rz86ln01v7r";
-        authors = [
-          "The Rust Project Developers"
-        ];
-        
-      };
-      "regex-syntax 0.6.17" = rec {
+      "regex-syntax" = rec {
         crateName = "regex-syntax";
         version = "0.6.17";
         edition = "2015";
@@ -3895,7 +3506,7 @@ rec {
         dependencies = [
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
           }
           {
             name = "winapi";
@@ -3927,42 +3538,7 @@ rec {
           "default" = [ "use_std" ];
         };
       };
-      "security-framework 0.1.16" = rec {
-        crateName = "security-framework";
-        version = "0.1.16";
-        edition = "2015";
-        sha256 = "0ci39ax08h2ngrl1yf1ra9smivhjs6xarmg7kp6fxracqpllx96z";
-        authors = [
-          "Steven Fackler <sfackler@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "core-foundation";
-            packageId = "core-foundation 0.2.3";
-          }
-          {
-            name = "core-foundation-sys";
-            packageId = "core-foundation-sys 0.2.3";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-          {
-            name = "security-framework-sys";
-            packageId = "security-framework-sys 0.1.16";
-          }
-        ];
-        features = {
-          "OSX_10_10" = [ "OSX_10_9" "security-framework-sys/OSX_10_10" ];
-          "OSX_10_11" = [ "OSX_10_10" "security-framework-sys/OSX_10_11" ];
-          "OSX_10_12" = [ "OSX_10_11" "security-framework-sys/OSX_10_11" ];
-          "OSX_10_8" = [ "security-framework-sys/OSX_10_8" ];
-          "OSX_10_9" = [ "OSX_10_8" "security-framework-sys/OSX_10_9" ];
-        };
-        resolvedDefaultFeatures = [ "OSX_10_8" ];
-      };
-      "security-framework 0.4.4" = rec {
+      "security-framework" = rec {
         crateName = "security-framework";
         version = "0.4.4";
         edition = "2015";
@@ -3974,15 +3550,15 @@ rec {
         dependencies = [
           {
             name = "bitflags";
-            packageId = "bitflags 1.2.1";
+            packageId = "bitflags";
           }
           {
             name = "core-foundation";
-            packageId = "core-foundation 0.7.0";
+            packageId = "core-foundation";
           }
           {
             name = "core-foundation-sys";
-            packageId = "core-foundation-sys 0.7.0";
+            packageId = "core-foundation-sys";
           }
           {
             name = "libc";
@@ -3990,7 +3566,7 @@ rec {
           }
           {
             name = "security-framework-sys";
-            packageId = "security-framework-sys 0.4.3";
+            packageId = "security-framework-sys";
           }
         ];
         features = {
@@ -4001,33 +3577,7 @@ rec {
           "OSX_10_9" = [ "security-framework-sys/OSX_10_9" ];
         };
       };
-      "security-framework-sys 0.1.16" = rec {
-        crateName = "security-framework-sys";
-        version = "0.1.16";
-        edition = "2015";
-        sha256 = "1bdy87gvmahiiyfzghsdg2dkhznww3p3d3r676qs0y32hcg648al";
-        authors = [
-          "Steven Fackler <sfackler@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "core-foundation-sys";
-            packageId = "core-foundation-sys 0.2.3";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-        ];
-        features = {
-          "OSX_10_10" = [ "OSX_10_9" ];
-          "OSX_10_11" = [ "OSX_10_10" ];
-          "OSX_10_12" = [ "OSX_10_11" ];
-          "OSX_10_9" = [ "OSX_10_8" ];
-        };
-        resolvedDefaultFeatures = [ "OSX_10_8" ];
-      };
-      "security-framework-sys 0.4.3" = rec {
+      "security-framework-sys" = rec {
         crateName = "security-framework-sys";
         version = "0.4.3";
         edition = "2015";
@@ -4039,7 +3589,7 @@ rec {
         dependencies = [
           {
             name = "core-foundation-sys";
-            packageId = "core-foundation-sys 0.7.0";
+            packageId = "core-foundation-sys";
           }
           {
             name = "libc";
@@ -4215,7 +3765,7 @@ rec {
         dependencies = [
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
           }
         ];
         
@@ -4432,7 +3982,7 @@ rec {
           }
           {
             name = "native-tls";
-            packageId = "native-tls 0.2.4";
+            packageId = "native-tls";
             rename = "native-tls-crate";
             optional = true;
           }
@@ -4455,26 +4005,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "native-tls" "native-tls-crate" "pem" ];
       };
-      "tempdir" = rec {
-        crateName = "tempdir";
-        version = "0.3.7";
-        edition = "2015";
-        sha256 = "1n5n86zxpgd85y0mswrp5cfdisizq2rv3la906g6ipyc03xvbwhm";
-        authors = [
-          "The Rust Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "rand";
-            packageId = "rand 0.4.6";
-          }
-          {
-            name = "remove_dir_all";
-            packageId = "remove_dir_all";
-          }
-        ];
-        
-      };
       "tempfile 2.2.0" = rec {
         crateName = "tempfile";
         version = "2.2.0";
@@ -4554,43 +4084,7 @@ rec {
         ];
         
       };
-      "thread-id" = rec {
-        crateName = "thread-id";
-        version = "2.0.0";
-        edition = "2015";
-        sha256 = "00zzs2bx1xw8aqm5plqqgr7bc2zz6zkqrdxq8vpiqb8hc2srslx9";
-        authors = [
-          "Ruud van Asseldonk <dev@veniogames.com>"
-        ];
-        dependencies = [
-          {
-            name = "kernel32-sys";
-            packageId = "kernel32-sys";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-        ];
-        
-      };
-      "thread_local 0.2.7" = rec {
-        crateName = "thread_local";
-        version = "0.2.7";
-        edition = "2015";
-        sha256 = "1mgxikqvhpsic6xk7pan95lvgsky1sdxzw2w5m2l35pgrazxnxl5";
-        authors = [
-          "Amanieu d'Antras <amanieu@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "thread-id";
-            packageId = "thread-id";
-          }
-        ];
-        
-      };
-      "thread_local 1.0.1" = rec {
+      "thread_local" = rec {
         crateName = "thread_local";
         version = "1.0.1";
         edition = "2015";
@@ -4601,7 +4095,7 @@ rec {
         dependencies = [
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
           }
         ];
         
@@ -4708,7 +4202,7 @@ rec {
         dependencies = [
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
             optional = true;
           }
         ];
@@ -4729,7 +4223,7 @@ rec {
         dependencies = [
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
           }
           {
             name = "log";
@@ -4789,7 +4283,7 @@ rec {
           }
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
             optional = true;
           }
           {
@@ -4799,7 +4293,7 @@ rec {
           }
           {
             name = "regex";
-            packageId = "regex 1.3.7";
+            packageId = "regex";
             optional = true;
           }
           {
@@ -5019,16 +4513,6 @@ rec {
           }
         ];
         
-      };
-      "utf8-ranges" = rec {
-        crateName = "utf8-ranges";
-        version = "0.1.3";
-        edition = "2015";
-        sha256 = "03xf604b2v51ag3jgzw92l97xnb10kw9zv948bhc7ja1ik017jm1";
-        authors = [
-          "Andrew Gallant <jamslam@gmail.com>"
-        ];
-        
       };
       "uuid" = rec {
         crateName = "uuid";
@@ -5151,7 +4635,7 @@ rec {
           }
           {
             name = "lazy_static";
-            packageId = "lazy_static 1.4.0";
+            packageId = "lazy_static";
           }
           {
             name = "log";
@@ -5724,7 +5208,7 @@ rec {
         dependencies = [
           {
             name = "bitflags";
-            packageId = "bitflags 1.2.1";
+            packageId = "bitflags";
           }
           {
             name = "wepoll-sys";
diff --git a/crate-hashes.json b/crate-hashes.json
index afc5b55..efed7e5 100644
--- a/crate-hashes.json
+++ b/crate-hashes.json
@@ -1,4 +1,3 @@
 {
-  "amqp 0.1.0 (git+https://github.com/grahamc/rust-amqp.git#b58edf8822072688d882966f7427f0a9e67aee78)": "0a0n8h71lnsl2rbi6v1zmy015f7hl91y5mgx3qzxlfrn3pjz8sy1",
   "hubcaps 0.3.16 (git+https://github.com/grahamc/hubcaps.git#5e656ba35ab4ee74aa72b3b5c3a62e1bf351ff6a)": "1p7rn8y71fjwfag65437gz7a56pysz9n69smaknvblyxpjdzmh4d"
 }
\ No newline at end of file
diff --git a/default.nix b/default.nix
index c1b3158..2003db4 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,4 @@
 { pkgs ? import ./nix {
-    config.permittedInsecurePackages = [
-      "openssl-1.0.2u"
-    ];
     overlays = [ (import ./nix/overlay.nix) ];
   }
 , ofborgCrates ? import ./Cargo.nix {
diff --git a/nix/overlay.nix b/nix/overlay.nix
index d874abd..fe17a56 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -9,13 +9,6 @@
       buildInputs = with self.darwin.apple_sdk.frameworks;
         super.lib.optional super.stdenv.isDarwin Security;
     };
-    openssl-sys = attrs: {
-      buildInputs = [ self.openssl_1_0_2 ];
-      nativeBuildInputs = [ self.pkgconfig ];
-    };
-    openssl = attrs: {
-      DEP_OPENSSL_VERSION = "102";
-    };
   };
 })
 
diff --git a/ofborg/Cargo.toml b/ofborg/Cargo.toml
index 63f8e54..704c00c 100644
--- a/ofborg/Cargo.toml
+++ b/ofborg/Cargo.toml
@@ -7,8 +7,6 @@ edition = "2018"
 
 [dependencies]
 either = "1.4.0"
-# amqp = { path = "./rust-amqp/" } # for testing patches
-amqp = { git = "https://github.com/grahamc/rust-amqp.git" }
 md5 = "0.3.5"
 uuid = { version = "0.4", features = ["v4"] }
 fs2 = "0.4.2"
@@ -21,7 +19,7 @@ tracing-subscriber = { version = "0.2.5", features = ["json"] }
 hubcaps = { git = "https://github.com/grahamc/hubcaps.git" }
 #hubcaps = { path = "../../../grahamc/hubcaps/" } # for testing patches
 hyper = "0.10.*"
-hyper-native-tls = "0.2.4"
+hyper-native-tls = "0.3.0"
 lru-cache = "0.1.1"
 nom = "4.0.0-beta3"
 sys-info = "0.5.6"
diff --git a/ofborg/src/easyamqp.rs b/ofborg/src/easyamqp.rs
index d2b4b13..0df4da6 100644
--- a/ofborg/src/easyamqp.rs
+++ b/ofborg/src/easyamqp.rs
@@ -1,9 +1,3 @@
-use crate::config::RabbitMQConfig;
-use crate::ofborg;
-
-use amqp::Basic;
-use tracing::info;
-
 pub struct ConsumeConfig {
     /// Specifies the name of the queue to consume from.
     pub queue: String,
@@ -264,39 +258,6 @@ pub struct QueueConfig {
     pub no_wait: bool,
 }
 
-pub fn session_from_config(config: &RabbitMQConfig) -> Result<amqp::Session, amqp::AMQPError> {
-    let scheme = if config.ssl {
-        amqp::AMQPScheme::AMQPS
-    } else {
-        amqp::AMQPScheme::AMQP
-    };
-
-    let mut properties = amqp::Table::new();
-    properties.insert(
-        "ofborg_version".to_owned(),
-        amqp::TableEntry::LongString(ofborg::VERSION.to_owned()),
-    );
-
-    let options = amqp::Options {
-        host: config.host.clone(),
-        port: match scheme {
-            amqp::AMQPScheme::AMQPS => 5671,
-            amqp::AMQPScheme::AMQP => 5672,
-        },
-        vhost: config.virtualhost.clone().unwrap_or_else(|| "/".to_owned()),
-        login: config.username.clone(),
-        password: config.password.clone(),
-        scheme,
-        properties,
-        ..amqp::Options::default()
-    };
-
-    let session = amqp::Session::new(options)?;
-
-    info!("Connected to {}", &config.host);
-    Ok(session)
-}
-
 pub trait ChannelExt {
     type Error;
     fn declare_exchange(&mut self, config: ExchangeConfig) -> Result<(), Self::Error>;
@@ -309,64 +270,3 @@ pub trait ConsumerExt<'a, C> {
     type Handle;
     fn consume(self, callback: C, config: ConsumeConfig) -> Result<Self::Handle, Self::Error>;
 }
-
-impl ChannelExt for amqp::Channel {
-    type Error = amqp::AMQPError;
-
-    fn declare_exchange(&mut self, config: ExchangeConfig) -> Result<(), Self::Error> {
-        self.exchange_declare(
-            config.exchange,
-            config.exchange_type.into(),
-            config.passive,
-            config.durable,
-            config.auto_delete,
-            config.internal,
-            config.no_wait,
-            amqp::Table::new(),
-        )?;
-        Ok(())
-    }
-
-    fn declare_queue(&mut self, config: QueueConfig) -> Result<(), Self::Error> {
-        self.queue_declare(
-            config.queue,
-            config.passive,
-            config.durable,
-            config.exclusive,
-            config.auto_delete,
-            config.no_wait,
-            amqp::Table::new(),
-        )?;
-        Ok(())
-    }
-
-    fn bind_queue(&mut self, config: BindQueueConfig) -> Result<(), Self::Error> {
-        self.queue_bind(
-            config.queue,
-            config.exchange,
-            config.routing_key.unwrap_or_else(|| "".to_owned()),
-            config.no_wait,
-            amqp::Table::new(),
-        )?;
-        Ok(())
-    }
-}
-
-impl<C: amqp::Consumer + 'static> ConsumerExt<'_, C> for amqp::Channel {
-    type Error = amqp::AMQPError;
-    type Handle = Self;
-
-    fn consume(mut self, callback: C, config: ConsumeConfig) -> Result<Self::Handle, Self::Error> {
-        self.basic_consume(
-            callback,
-            config.queue,
-            config.consumer_tag,
-            config.no_local,
-            config.no_ack,
-            config.exclusive,
-            config.no_wait,
-            amqp::Table::new(),
-        )?;
-        Ok(self)
-    }
-}
diff --git a/ofborg/src/notifyworker.rs b/ofborg/src/notifyworker.rs
index 9be12d4..c076342 100644
--- a/ofborg/src/notifyworker.rs
+++ b/ofborg/src/notifyworker.rs
@@ -1,14 +1,5 @@
 use crate::worker::Action;
 
-use amqp::protocol::basic::{BasicProperties, Deliver};
-use amqp::Basic;
-
-use std::marker::Send;
-
-pub struct NotifyWorker<T: SimpleNotifyWorker> {
-    internal: T,
-}
-
 pub trait SimpleNotifyWorker {
     type J;
 
@@ -42,75 +33,3 @@ impl NotificationReceiver for DummyNotificationReceiver {
         self.actions.push(action);
     }
 }
-
-pub struct ChannelNotificationReceiver<'a> {
-    channel: &'a mut amqp::Channel,
-    delivery_tag: u64,
-}
-
-impl<'a> ChannelNotificationReceiver<'a> {
-    pub fn new(
-        channel: &'a mut amqp::Channel,
-        delivery_tag: u64,
-    ) -> ChannelNotificationReceiver<'a> {
-        ChannelNotificationReceiver {
-            channel,
-            delivery_tag,
-        }
-    }
-}
-
-impl<'a> NotificationReceiver for ChannelNotificationReceiver<'a> {
-    fn tell(&mut self, action: Action) {
-        match action {
-            Action::Ack => {
-                self.channel.basic_ack(self.delivery_tag, false).unwrap();
-            }
-            Action::NackRequeue => {
-                self.channel
-                    .basic_nack(self.delivery_tag, false, true)
-                    .unwrap();
-            }
-            Action::NackDump => {
-                self.channel
-                    .basic_nack(self.delivery_tag, false, false)
-                    .unwrap();
-            }
-            Action::Publish(mut msg) => {
-                let exch = msg.exchange.take().unwrap_or_else(|| "".to_owned());
-                let key = msg.routing_key.take().unwrap_or_else(|| "".to_owned());
-
-                let props = BasicProperties {
-                    content_type: msg.content_type,
-                    delivery_mode: Some(2), // persistent
-                    ..Default::default()
-                };
-                self.channel
-                    .basic_publish(exch, key, msg.mandatory, msg.immediate, props, msg.content)
-                    .unwrap();
-            }
-        }
-    }
-}
-
-pub fn new<T: SimpleNotifyWorker>(worker: T) -> NotifyWorker<T> {
-    NotifyWorker { internal: worker }
-}
-
-impl<T: SimpleNotifyWorker + Send> amqp::Consumer for NotifyWorker<T> {
-    fn handle_delivery(
-        &mut self,
-        channel: &mut amqp::Channel,
-        method: Deliver,
-        headers: BasicProperties,
-        body: Vec<u8>,
-    ) {
-        let mut receiver = ChannelNotificationReceiver::new(channel, method.delivery_tag);
-
-        let job = self
-            .internal
-            .msg_to_job(&method.routing_key, &headers.content_type, &body)
-            .unwrap();
-        self.internal.consumer(&job, &mut receiver);
-    }
-}
diff --git a/ofborg/src/stats.rs b/ofborg/src/stats.rs
index 18ce660..e5363ab 100644
--- a/ofborg/src/stats.rs
+++ b/ofborg/src/stats.rs
@@ -1,5 +1,3 @@
-use amqp::protocol::basic;
-use amqp::Basic;
 use async_std::task;
 use lapin::options::BasicPublishOptions;
 
@@ -26,38 +24,6 @@ pub struct RabbitMQ<C> {
     channel: C,
 }
 
-impl RabbitMQ<amqp::Channel> {
-    pub fn from_amqp(identity: &str, channel: amqp::Channel) -> Self {
-        RabbitMQ {
-            identity: identity.to_owned(),
-            channel,
-        }
-    }
-}
-
-impl SysEvents for RabbitMQ<amqp::Channel> {
-    fn notify(&mut self, event: Event) {
-        let props = basic::BasicProperties {
-            ..Default::default()
-        };
-        self.channel
-            .basic_publish(
-                String::from("stats"),
-                "".to_owned(),
-                false,
-                false,
-                props,
-                serde_json::to_string(&EventMessage {
-                    sender: self.identity.clone(),
-                    events: vec![event],
-                })
-                .unwrap()
-                .into_bytes(),
-            )
-            .unwrap();
-    }
-}
-
 impl RabbitMQ<lapin::Channel> {
     pub fn from_lapin(identity: &str, channel: lapin::Channel) -> Self {
         RabbitMQ {
diff --git a/ofborg/src/worker.rs b/ofborg/src/worker.rs
index 960917a..bf4f3bc 100644
--- a/ofborg/src/worker.rs
+++ b/ofborg/src/worker.rs
@@ -1,13 +1,6 @@
 use std::marker::Send;
 
-use amqp::protocol::basic::{BasicProperties, Deliver};
-use amqp::Basic;
 use serde::Serialize;
-use tracing::error;
-
-pub struct Worker<T: SimpleWorker> {
-    internal: T,
-}
 
 pub struct Response {}
 
@@ -61,58 +54,3 @@ pub trait SimpleWorker: Send {
         body: &[u8],
     ) -> Result<Self::J, String>;
 }
-
-pub fn new<T: SimpleWorker>(worker: T) -> Worker<T> {
-    Worker { internal: worker }
-}
-
-impl<T: SimpleWorker + Send> amqp::Consumer for Worker<T> {
-    fn handle_delivery(
-        &mut self,
-        channel: &mut amqp::Channel,
-        method: Deliver,
-        headers: BasicProperties,
-        body: Vec<u8>,
-    ) {
-        let job = self
-            .internal
-            .msg_to_job(&method.routing_key, &headers.content_type, &body);
-
-        if let Err(e) = job {
-            error!("Error decoding job: {:?}", e);
-            channel.basic_ack(method.delivery_tag, false).unwrap();
-            return;
-        }
-
-        for action in self.internal.consumer(&job.unwrap()) {
-            match action {
-                Action::Ack => {
-                    channel.basic_ack(method.delivery_tag, false).unwrap();
-                }
-                Action::NackRequeue => {
-                    channel
-                        .basic_nack(method.delivery_tag, false, true)
-                        .unwrap();
-                }
-                Action::NackDump => {
-                    channel
-                        .basic_nack(method.delivery_tag, false, false)
-                        .unwrap();
-                }
-                Action::Publish(mut msg) => {
-                    let exch = msg.exchange.take().unwrap_or_else(|| "".to_owned());
-                    let key = msg.routing_key.take().unwrap_or_else(|| "".to_owned());
-
-                    let props = BasicProperties {
-                        content_type: msg.content_type,
-                        delivery_mode: Some(2), // persistent
-                        ..Default::default()
-                    };
-                    channel
-                        .basic_publish(exch, key, msg.mandatory, msg.immediate, props, msg.content)
-                        .unwrap();
-                }
-            }
-        }
-    }
-}
diff --git a/release.nix b/release.nix
index 2ea02f8..bee79b2 100644
--- a/release.nix
+++ b/release.nix
@@ -3,9 +3,6 @@
 }:
 let
   pkgs = import nixpkgs {
-    config.permittedInsecurePackages = [
-      "openssl-1.0.2u"
-    ];
     overlays = [ (import ./nix/overlay.nix) ];
   };
   inherit (pkgs) lib;
@@ -21,9 +18,6 @@ let
       collector // {
         "${system}" = import ./. {
           pkgs = import nixpkgs {
-            config.permittedInsecurePackages = [
-              "openssl-1.0.2u"
-            ];
             inherit system;
             overlays = [
               (import ./nix/overlay.nix)
diff --git a/shell.nix b/shell.nix
index f2c2e66..f85f7f7 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,4 @@
 { pkgs ? import ./nix {
-  config.permittedInsecurePackages = [
-    "openssl-1.0.2u"
-  ];
-
   overlays = [
     (import ./nix/overlay.nix)
     (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
@@ -45,7 +41,7 @@ let
       latest.rustChannels.stable.rust
       git
       pkgconfig
-      openssl_1_0_2.dev
+      openssl
     ]
       ++ stdenv.lib.optional stdenv.isDarwin pkgs.darwin.Security;
 
@@ -83,7 +79,7 @@ let
       nix-prefetch-git
       latest.rustChannels.stable.rust
       #rustfmt
-      openssl_1_0_2.dev
+      openssl
       pkgconfig
       git
     ]