diff --git a/.cargo/audit.toml b/.cargo/audit.toml
index b718ff211..2d2668d93 100644
--- a/.cargo/audit.toml
+++ b/.cargo/audit.toml
@@ -1,34 +1,16 @@
 [advisories]
 ignore = [
-    "RUSTSEC-2020-0016", # net2 crate has been deprecated; use socket2 instead
-    # https://github.com/rust-lang/docs.rs/issues/760
-
     "RUSTSEC-2020-0036", # failure is officially deprecated/unmaintained
     # https://github.com/rust-lang/docs.rs/issues/1014
 
-    "RUSTSEC-2020-0056", # stdweb is unmaintained
-    # https://github.com/rust-lang/docs.rs/issues/1122
-
     "RUSTSEC-2020-0071", # `time` localtime_r segfault
     # https://github.com/rust-lang/docs.rs/issues/1523
 
     "RUSTSEC-2020-0159", # `chrono` localtime_r segfault
     # https://github.com/rust-lang/docs.rs/issues/1525
 
-    "RUSTSEC-2021-0078", # Lenient hyper header parsing of Content-Length could allow request smuggling
-    # https://github.com/rust-lang/docs.rs/issues/1460
-
-    "RUSTSEC-2021-0079", # Integer overflow in hyper's parsing of the Transfer-Encoding header leads to data loss
-    # https://github.com/rust-lang/docs.rs/issues/1459
-
     "RUSTSEC-2021-0127", # serde_cbor is unmaintained
     # https://github.com/rust-lang/docs.rs/issues/1568
-
-    "RUSTSEC-2021-0144", # traitobject is Unmaintained 
-    # https://github.com/rust-lang/docs.rs/issues/1826
-
-    "RUSTSEC-2019-0039", # typemap is Unmaintained 
-    # https://github.com/rust-lang/docs.rs/issues/1827
 ]
 informational_warnings = ["unmaintained"] # warn for categories of informational advisories
 severity_threshold = "low" # CVSS severity ("none", "low", "medium", "high", "critical")
diff --git a/Cargo.lock b/Cargo.lock
index dc5c9cda5..cab3bdb5a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,7 +25,7 @@ checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
  "getrandom 0.2.8",
  "once_cell",
- "version_check 0.9.4",
+ "version_check",
 ]
 
 [[package]]
@@ -37,7 +37,7 @@ dependencies = [
  "cfg-if",
  "getrandom 0.2.8",
  "once_cell",
- "version_check 0.9.4",
+ "version_check",
 ]
 
 [[package]]
@@ -134,10 +134,10 @@ checksum = "fdb8867f378f33f78a811a8eb9bf108ad99430d7aad43315dd9319c827ef6247"
 dependencies = [
  "flate2",
  "http",
- "log 0.4.17",
+ "log",
  "native-tls",
  "openssl",
- "url 2.3.1",
+ "url",
  "wildmatch",
 ]
 
@@ -152,15 +152,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "autocfg"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
-dependencies = [
- "autocfg 1.1.0",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -186,7 +177,7 @@ dependencies = [
  "bytes",
  "hex",
  "http",
- "hyper 0.14.23",
+ "hyper",
  "ring",
  "time 0.3.17",
  "tokio",
@@ -222,7 +213,7 @@ dependencies = [
  "http",
  "http-body",
  "lazy_static",
- "percent-encoding 2.2.0",
+ "percent-encoding",
  "pin-project-lite",
  "tracing",
 ]
@@ -348,7 +339,7 @@ dependencies = [
  "hex",
  "http",
  "once_cell",
- "percent-encoding 2.2.0",
+ "percent-encoding",
  "regex",
  "ring",
  "time 0.3.17",
@@ -403,7 +394,7 @@ dependencies = [
  "fastrand",
  "http",
  "http-body",
- "hyper 0.14.23",
+ "hyper",
  "hyper-rustls",
  "lazy_static",
  "pin-project-lite",
@@ -437,9 +428,9 @@ dependencies = [
  "futures-core",
  "http",
  "http-body",
- "hyper 0.14.23",
+ "hyper",
  "once_cell",
- "percent-encoding 2.2.0",
+ "percent-encoding",
  "pin-project-lite",
  "pin-utils",
  "tokio",
@@ -557,12 +548,12 @@ dependencies = [
  "headers",
  "http",
  "http-body",
- "hyper 0.14.23",
+ "hyper",
  "itoa 1.0.4",
  "matchit",
  "memchr",
- "mime 0.3.16",
- "percent-encoding 2.2.0",
+ "mime",
+ "percent-encoding",
  "pin-project-lite",
  "rustversion",
  "serde",
@@ -588,7 +579,7 @@ dependencies = [
  "futures-util",
  "http",
  "http-body",
- "mime 0.3.16",
+ "mime",
  "rustversion",
  "tower-layer",
  "tower-service",
@@ -604,7 +595,7 @@ dependencies = [
  "bytes",
  "futures-util",
  "http",
- "mime 0.3.16",
+ "mime",
  "pin-project-lite",
  "tokio",
  "tower",
@@ -628,16 +619,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base64"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
-dependencies = [
- "byteorder",
- "safemem",
-]
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -934,15 +915,6 @@ dependencies = [
  "os_str_bytes",
 ]
 
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "clru"
 version = "0.5.0"
@@ -1176,7 +1148,7 @@ version = "0.9.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "cfg-if",
  "crossbeam-utils",
  "memoffset 0.7.1",
@@ -1436,18 +1408,18 @@ dependencies = [
  "hostname",
  "http",
  "httpdate",
- "hyper 0.14.23",
+ "hyper",
  "indoc",
- "iron",
  "kuchiki",
- "log 0.4.17",
+ "log",
  "lol_html",
  "memmap2",
- "mime 0.3.16",
- "mime_guess 2.0.4",
+ "mime",
+ "mime_guess",
  "mockito",
  "once_cell",
  "path-slash",
+ "percent-encoding",
  "postgres",
  "postgres-types",
  "procfs",
@@ -1458,7 +1430,6 @@ dependencies = [
  "rayon",
  "regex",
  "reqwest",
- "router",
  "rustwide",
  "schemamama",
  "schemamama_postgres",
@@ -1482,7 +1453,6 @@ dependencies = [
  "test-case",
  "thiserror",
  "thread_local",
- "time 0.1.45",
  "time 0.3.17",
  "tokio",
  "toml",
@@ -1492,7 +1462,7 @@ dependencies = [
  "tracing",
  "tracing-log",
  "tracing-subscriber",
- "url 2.3.1",
+ "url",
  "uuid",
  "walkdir",
  "zip",
@@ -1679,7 +1649,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
 dependencies = [
- "percent-encoding 2.2.0",
+ "percent-encoding",
 ]
 
 [[package]]
@@ -1692,12 +1662,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
 [[package]]
 name = "futf"
 version = "0.1.5"
@@ -1786,7 +1750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
 dependencies = [
  "typenum",
- "version_check 0.9.4",
+ "version_check",
 ]
 
 [[package]]
@@ -2244,7 +2208,7 @@ dependencies = [
  "git-url",
  "git-validate",
  "git-worktree",
- "log 0.4.17",
+ "log",
  "once_cell",
  "signal-hook",
  "smallvec",
@@ -2332,7 +2296,7 @@ dependencies = [
  "git-path",
  "home",
  "thiserror",
- "url 2.3.1",
+ "url",
 ]
 
 [[package]]
@@ -2372,10 +2336,10 @@ dependencies = [
  "bitflags",
  "libc",
  "libgit2-sys",
- "log 0.4.17",
+ "log",
  "openssl-probe",
  "openssl-sys",
- "url 2.3.1",
+ "url",
 ]
 
 [[package]]
@@ -2387,7 +2351,7 @@ dependencies = [
  "aho-corasick",
  "bstr 0.2.17",
  "fnv",
- "log 0.4.17",
+ "log",
  "regex",
 ]
 
@@ -2489,7 +2453,7 @@ dependencies = [
  "headers-core",
  "http",
  "httpdate",
- "mime 0.3.16",
+ "mime",
  "sha1",
 ]
 
@@ -2570,7 +2534,7 @@ version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
 dependencies = [
- "log 0.4.17",
+ "log",
  "mac",
  "markup5ever",
  "proc-macro2",
@@ -2630,25 +2594,6 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026"
 
-[[package]]
-name = "hyper"
-version = "0.10.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
-dependencies = [
- "base64 0.9.3",
- "httparse",
- "language-tags",
- "log 0.3.9",
- "mime 0.2.6",
- "num_cpus",
- "time 0.1.45",
- "traitobject",
- "typeable",
- "unicase 1.4.2",
- "url 1.7.2",
-]
-
 [[package]]
 name = "hyper"
 version = "0.14.23"
@@ -2680,8 +2625,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
 dependencies = [
  "http",
- "hyper 0.14.23",
- "log 0.4.17",
+ "hyper",
+ "log",
  "rustls",
  "rustls-native-certs",
  "tokio",
@@ -2695,7 +2640,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.23",
+ "hyper",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -2725,17 +2670,6 @@ dependencies = [
  "cxx-build",
 ]
 
-[[package]]
-name = "idna"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "0.3.0"
@@ -2755,7 +2689,7 @@ dependencies = [
  "crossbeam-utils",
  "globset",
  "lazy_static",
- "log 0.4.17",
+ "log",
  "memchr",
  "regex",
  "same-file",
@@ -2780,7 +2714,7 @@ version = "1.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "hashbrown 0.12.3",
 ]
 
@@ -2831,22 +2765,6 @@ version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
 
-[[package]]
-name = "iron"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8"
-dependencies = [
- "hyper 0.10.16",
- "log 0.3.9",
- "mime_guess 1.8.8",
- "modifier",
- "num_cpus",
- "plugin",
- "typemap",
- "url 1.7.2",
-]
-
 [[package]]
 name = "is-terminal"
 version = "0.4.1"
@@ -2920,12 +2838,6 @@ dependencies = [
  "selectors",
 ]
 
-[[package]]
-name = "language-tags"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
-
 [[package]]
 name = "lasso"
 version = "0.5.1"
@@ -3027,19 +2939,10 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "scopeguard",
 ]
 
-[[package]]
-name = "log"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-dependencies = [
- "log 0.4.17",
-]
-
 [[package]]
 name = "log"
 version = "0.4.17"
@@ -3080,7 +2983,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
 dependencies = [
- "log 0.4.17",
+ "log",
  "phf 0.8.0",
  "phf_codegen 0.8.0",
  "string_cache",
@@ -3156,7 +3059,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]
 
 [[package]]
@@ -3165,16 +3068,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
 dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "mime"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-dependencies = [
- "log 0.3.9",
+ "autocfg",
 ]
 
 [[package]]
@@ -3183,26 +3077,14 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
-[[package]]
-name = "mime_guess"
-version = "1.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3"
-dependencies = [
- "mime 0.2.6",
- "phf 0.7.24",
- "phf_codegen 0.7.24",
- "unicase 1.4.2",
-]
-
 [[package]]
 name = "mime_guess"
 version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
 dependencies = [
- "mime 0.3.16",
- "unicase 2.6.0",
+ "mime",
+ "unicase",
 ]
 
 [[package]]
@@ -3236,7 +3118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
 dependencies = [
  "libc",
- "log 0.4.17",
+ "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.42.0",
 ]
@@ -3251,7 +3133,7 @@ dependencies = [
  "colored",
  "httparse",
  "lazy_static",
- "log 0.4.17",
+ "log",
  "rand 0.8.5",
  "regex",
  "serde_json",
@@ -3259,12 +3141,6 @@ dependencies = [
  "similar",
 ]
 
-[[package]]
-name = "modifier"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58"
-
 [[package]]
 name = "native-tls"
 version = "0.2.11"
@@ -3273,7 +3149,7 @@ checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
 dependencies = [
  "lazy_static",
  "libc",
- "log 0.4.17",
+ "log",
  "openssl",
  "openssl-probe",
  "openssl-sys",
@@ -3295,7 +3171,7 @@ version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "bitflags",
  "cfg-if",
  "libc",
@@ -3335,7 +3211,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -3346,7 +3222,7 @@ version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "num-traits",
 ]
 
@@ -3356,7 +3232,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -3368,7 +3244,7 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]
 
 [[package]]
@@ -3483,7 +3359,7 @@ version = "0.9.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "cc",
  "libc",
  "openssl-src",
@@ -3497,7 +3373,7 @@ version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f"
 dependencies = [
- "log 0.4.17",
+ "log",
  "serde",
  "winapi",
 ]
@@ -3561,12 +3437,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
 
-[[package]]
-name = "percent-encoding"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
@@ -3617,15 +3487,6 @@ dependencies = [
  "sha1",
 ]
 
-[[package]]
-name = "phf"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
-dependencies = [
- "phf_shared 0.7.24",
-]
-
 [[package]]
 name = "phf"
 version = "0.8.0"
@@ -3657,16 +3518,6 @@ dependencies = [
  "phf_shared 0.11.1",
 ]
 
-[[package]]
-name = "phf_codegen"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
-dependencies = [
- "phf_generator 0.7.24",
- "phf_shared 0.7.24",
-]
-
 [[package]]
 name = "phf_codegen"
 version = "0.8.0"
@@ -3687,16 +3538,6 @@ dependencies = [
  "phf_shared 0.11.1",
 ]
 
-[[package]]
-name = "phf_generator"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-dependencies = [
- "phf_shared 0.7.24",
- "rand 0.6.5",
-]
-
 [[package]]
 name = "phf_generator"
 version = "0.8.0"
@@ -3765,23 +3606,13 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "phf_shared"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-dependencies = [
- "siphasher 0.2.3",
- "unicase 1.4.2",
-]
-
 [[package]]
 name = "phf_shared"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
 dependencies = [
- "siphasher 0.3.10",
+ "siphasher",
 ]
 
 [[package]]
@@ -3790,7 +3621,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9"
 dependencies = [
- "siphasher 0.3.10",
+ "siphasher",
 ]
 
 [[package]]
@@ -3799,7 +3630,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
 dependencies = [
- "siphasher 0.3.10",
+ "siphasher",
 ]
 
 [[package]]
@@ -3808,7 +3639,7 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
 dependencies = [
- "siphasher 0.3.10",
+ "siphasher",
  "uncased",
 ]
 
@@ -3878,15 +3709,6 @@ dependencies = [
  "plotters-backend",
 ]
 
-[[package]]
-name = "plugin"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0"
-dependencies = [
- "typemap",
-]
-
 [[package]]
 name = "postgres"
 version = "0.19.4"
@@ -3896,7 +3718,7 @@ dependencies = [
  "bytes",
  "fallible-iterator",
  "futures-util",
- "log 0.4.17",
+ "log",
  "tokio",
  "tokio-postgres",
 ]
@@ -3979,7 +3801,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn",
- "version_check 0.9.4",
+ "version_check",
 ]
 
 [[package]]
@@ -3990,7 +3812,7 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
  "proc-macro2",
  "quote",
- "version_check 0.9.4",
+ "version_check",
 ]
 
 [[package]]
@@ -4068,7 +3890,7 @@ version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
 dependencies = [
- "log 0.4.17",
+ "log",
  "parking_lot",
  "scheduled-thread-pool",
 ]
@@ -4083,25 +3905,6 @@ dependencies = [
  "r2d2",
 ]
 
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.8",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg 0.1.2",
- "rand_xorshift",
- "winapi",
-]
-
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -4112,8 +3915,8 @@ dependencies = [
  "libc",
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
- "rand_hc 0.2.0",
- "rand_pcg 0.2.1",
+ "rand_hc",
+ "rand_pcg",
 ]
 
 [[package]]
@@ -4127,16 +3930,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -4157,21 +3950,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -4190,15 +3968,6 @@ dependencies = [
  "getrandom 0.2.8",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -4208,50 +3977,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.4.2",
-]
-
 [[package]]
 name = "rand_pcg"
 version = "0.2.1"
@@ -4261,15 +3986,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "rayon"
 version = "1.6.1"
@@ -4292,15 +4008,6 @@ dependencies = [
  "num_cpus",
 ]
 
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -4363,7 +4070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "882f368737489ea543bc5c340e6f3d34a28c39980bd9a979e47322b26f60ac40"
 dependencies = [
  "libc",
- "log 0.4.17",
+ "log",
  "num_cpus",
  "rayon",
  "winapi",
@@ -4383,15 +4090,15 @@ dependencies = [
  "h2",
  "http",
  "http-body",
- "hyper 0.14.23",
+ "hyper",
  "hyper-tls",
  "ipnet",
  "js-sys",
- "log 0.4.17",
- "mime 0.3.16",
+ "log",
+ "mime",
  "native-tls",
  "once_cell",
- "percent-encoding 2.2.0",
+ "percent-encoding",
  "pin-project-lite",
  "serde",
  "serde_json",
@@ -4399,7 +4106,7 @@ dependencies = [
  "tokio",
  "tokio-native-tls",
  "tower-service",
- "url 2.3.1",
+ "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -4421,23 +4128,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "route-recognizer"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea509065eb0b3c446acdd0102f0d46567dc30902dc0be91d6552035d92b0f4f8"
-
-[[package]]
-name = "router"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc63b6f3b8895b0d04e816b2b1aa58fdba2d5acca3cbb8f0ab8e017347d57397"
-dependencies = [
- "iron",
- "route-recognizer",
- "url 1.7.2",
-]
-
 [[package]]
 name = "roxmltree"
 version = "0.14.1"
@@ -4502,7 +4192,7 @@ version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
 dependencies = [
- "log 0.4.17",
+ "log",
  "ring",
  "sct",
  "webpki",
@@ -4551,9 +4241,9 @@ dependencies = [
  "git2",
  "http",
  "lazy_static",
- "log 0.4.17",
+ "log",
  "nix",
- "percent-encoding 2.2.0",
+ "percent-encoding",
  "remove_dir_all 0.7.0",
  "scopeguard",
  "serde",
@@ -4614,7 +4304,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f726d3b10198a91b545c12e55775ddf4abb681056aa62adf75ed00b68855ef9"
 dependencies = [
- "log 0.4.17",
+ "log",
 ]
 
 [[package]]
@@ -4682,7 +4372,7 @@ dependencies = [
  "cssparser",
  "derive_more",
  "fxhash",
- "log 0.4.17",
+ "log",
  "matches",
  "phf 0.8.0",
  "phf_codegen 0.8.0",
@@ -4789,7 +4479,7 @@ dependencies = [
  "sentry-core",
  "tower-layer",
  "tower-service",
- "url 2.3.1",
+ "url",
 ]
 
 [[package]]
@@ -4816,7 +4506,7 @@ dependencies = [
  "serde_json",
  "thiserror",
  "time 0.3.17",
- "url 2.3.1",
+ "url",
  "uuid",
 ]
 
@@ -4964,12 +4654,6 @@ version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
 
-[[package]]
-name = "siphasher"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-
 [[package]]
 name = "siphasher"
 version = "0.3.10"
@@ -4982,7 +4666,7 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
 ]
 
 [[package]]
@@ -5006,10 +4690,10 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "serde",
  "static_assertions",
- "version_check 0.9.4",
+ "version_check",
 ]
 
 [[package]]
@@ -5222,7 +4906,7 @@ dependencies = [
  "globwalk",
  "humansize",
  "lazy_static",
- "percent-encoding 2.2.0",
+ "percent-encoding",
  "pest",
  "pest_derive",
  "rand 0.8.5",
@@ -5376,7 +5060,7 @@ version = "1.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
 dependencies = [
- "autocfg 1.1.0",
+ "autocfg",
  "bytes",
  "libc",
  "memchr",
@@ -5422,9 +5106,9 @@ dependencies = [
  "fallible-iterator",
  "futures-channel",
  "futures-util",
- "log 0.4.17",
+ "log",
  "parking_lot",
- "percent-encoding 2.2.0",
+ "percent-encoding",
  "phf 0.11.1",
  "pin-project-lite",
  "postgres-protocol",
@@ -5534,7 +5218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if",
- "log 0.4.17",
+ "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -5568,7 +5252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
 dependencies = [
  "lazy_static",
- "log 0.4.17",
+ "log",
  "tracing-core",
 ]
 
@@ -5588,39 +5272,18 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "traitobject"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
-
 [[package]]
 name = "try-lock"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
-[[package]]
-name = "typeable"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
-
 [[package]]
 name = "typed-arena"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae"
 
-[[package]]
-name = "typemap"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6"
-dependencies = [
- "unsafe-any",
-]
-
 [[package]]
 name = "typenum"
 version = "1.16.0"
@@ -5657,7 +5320,7 @@ version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622"
 dependencies = [
- "version_check 0.9.4",
+ "version_check",
 ]
 
 [[package]]
@@ -5710,22 +5373,13 @@ dependencies = [
  "unic-common",
 ]
 
-[[package]]
-name = "unicase"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-dependencies = [
- "version_check 0.1.5",
-]
-
 [[package]]
 name = "unicase"
 version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 dependencies = [
- "version_check 0.9.4",
+ "version_check",
 ]
 
 [[package]]
@@ -5773,15 +5427,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
-[[package]]
-name = "unsafe-any"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
-dependencies = [
- "traitobject",
-]
-
 [[package]]
 name = "untrusted"
 version = "0.7.1"
@@ -5796,21 +5441,10 @@ checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f"
 dependencies = [
  "base64 0.13.1",
  "chunked_transfer",
- "log 0.4.17",
+ "log",
  "native-tls",
  "once_cell",
- "url 2.3.1",
-]
-
-[[package]]
-name = "url"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-dependencies = [
- "idna 0.1.5",
- "matches",
- "percent-encoding 1.0.1",
+ "url",
 ]
 
 [[package]]
@@ -5820,8 +5454,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
 dependencies = [
  "form_urlencoded",
- "idna 0.3.0",
- "percent-encoding 2.2.0",
+ "idna",
+ "percent-encoding",
  "serde",
 ]
 
@@ -5865,12 +5499,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -5894,7 +5522,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 dependencies = [
- "log 0.4.17",
+ "log",
  "try-lock",
 ]
 
@@ -5933,7 +5561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
 dependencies = [
  "bumpalo",
- "log 0.4.17",
+ "log",
  "once_cell",
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index f3d331742..9e66afb57 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,8 +38,6 @@ semver = { version = "1.0.4", features = ["serde"] }
 slug = "0.1.1"
 r2d2 = "0.8"
 r2d2_postgres = "0.18"
-# iron needs url@1, but it reexports it as iron::url, so we can start using
-# url@2 for other usecases
 url = { version = "2.1.1", features = ["serde"] }
 docsrs-metadata = { path = "crates/metadata" }
 anyhow = { version = "1.0.42", features = ["backtrace"]}
@@ -72,7 +70,7 @@ serde_cbor = "0.11.1"
 getrandom = "0.2.1"
 
 # Async
-tokio = { version = "1.0", features = ["rt-multi-thread"] }
+tokio = { version = "1.0", features = ["rt-multi-thread", "signal", "macros"] }
 futures-util = "0.3.5"
 aws-config = "0.51.0"
 aws-sdk-s3 = "0.21.0"
@@ -86,13 +84,10 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 memmap2 = "0.5.0"
 
-# iron dependencies
-iron = "0.6"
-router = "0.6"
-
 # axum dependencies
 axum = { version = "0.6.1", features = ["headers"]}
 axum-extra = "0.4.2"
+percent-encoding = "2.2.0"
 hyper = { version = "0.14.15", default-features = false }
 tower = "0.4.11"
 tower-service = "0.3.2"
@@ -109,7 +104,6 @@ walkdir = "2"
 
 # Date and Time utilities
 chrono = { version = "0.4.11", features = ["serde"] }
-time = "0.1" # TODO: Remove once `iron` is removed
 
 # Transitive dependencies we don't use directly but need to have specific versions of
 thread_local = "1.1.3"
@@ -131,7 +125,6 @@ test-case = "2.0.0"
 fn-error-context = "0.2.0"
 aws-smithy-client = { version = "0.51.0", features = ["test-util"]}
 aws-smithy-http = "0.51.0"
-tokio = { version = "1.0", features = ["rt-multi-thread", "macros"] }
 indoc = "1.0.7"
 
 [build-dependencies]
diff --git a/src/storage/mod.rs b/src/storage/mod.rs
index 3fd4a7f26..73ff0b6f6 100644
--- a/src/storage/mod.rs
+++ b/src/storage/mod.rs
@@ -22,6 +22,7 @@ use std::{
     sync::Arc,
 };
 use tokio::runtime::Runtime;
+use tracing::{instrument, trace};
 
 const MAX_CONCURRENT_UPLOADS: usize = 1000;
 
@@ -162,23 +163,27 @@ impl Storage {
         }
     }
 
+    #[instrument(skip(fetch_time))]
     pub(crate) fn fetch_rustdoc_file(
         &self,
         name: &str,
         version: &str,
         path: &str,
         archive_storage: bool,
-        fetch_time: &mut RenderingTimesRecorder,
+        fetch_time: Option<&mut RenderingTimesRecorder>,
     ) -> Result<Blob> {
+        trace!("fetch rustdoc file");
         Ok(if archive_storage {
             self.get_from_archive(
                 &rustdoc_archive_path(name, version),
                 path,
                 self.max_file_size_for(path),
-                Some(fetch_time),
+                fetch_time,
             )?
         } else {
-            fetch_time.step("fetch from storage");
+            if let Some(fetch_time) = fetch_time {
+                fetch_time.step("fetch from storage");
+            }
             // Add rustdoc prefix, name and version to the path for accessing the file stored in the database
             let remote_path = format!("rustdoc/{}/{}/{}", name, version, path);
             self.get(&remote_path, self.max_file_size_for(path))?
diff --git a/src/test/mod.rs b/src/test/mod.rs
index 3525deafa..1bf90f52c 100644
--- a/src/test/mod.rs
+++ b/src/test/mod.rs
@@ -6,13 +6,10 @@ use crate::db::{Pool, PoolClient};
 use crate::error::Result;
 use crate::repositories::RepositoryStatsUpdater;
 use crate::storage::{Storage, StorageKind};
-use crate::web::{
-    build_axum_app, build_strangler_service, cache, page::TemplateData, start_iron_server,
-};
+use crate::web::{build_axum_app, cache, page::TemplateData};
 use crate::{BuildQueue, Config, Context, Index, Metrics};
 use anyhow::Context as _;
 use fn_error_context::context;
-use iron::{headers::CacheControl, Listening};
 use once_cell::unsync::OnceCell;
 use postgres::Client as Connection;
 use reqwest::{
@@ -61,7 +58,7 @@ pub(crate) fn assert_no_cache(res: &Response) {
         res.headers()
             .get("Cache-Control")
             .expect("missing cache-control header"),
-        cache::NO_CACHE,
+        cache::NO_CACHING,
     );
 }
 
@@ -74,14 +71,13 @@ pub(crate) fn assert_cache_control(
     assert!(config.cache_control_stale_while_revalidate.is_some());
     let cache_control = res.headers().get("Cache-Control");
 
-    let expected_directives = cache_policy.render(config);
-    if expected_directives.is_empty() {
-        assert!(cache_control.is_none());
-    } else {
+    if let Some(expected_directives) = cache_policy.render(config) {
         assert_eq!(
             cache_control.expect("missing cache-control header"),
-            &CacheControl(expected_directives).to_string()
+            expected_directives,
         );
+    } else {
+        assert!(cache_control.is_none());
     }
 }
 
@@ -101,9 +97,9 @@ pub(crate) fn assert_success_cached(
     config: &Config,
 ) -> Result<()> {
     let response = web.get(path).send()?;
-    assert_cache_control(&response, cache_policy, config);
     let status = response.status();
     assert!(status.is_success(), "failed to GET {}: {}", path, status);
+    assert_cache_control(&response, cache_policy, config);
     Ok(())
 }
 
@@ -538,7 +534,6 @@ impl Drop for TestDatabase {
 }
 
 pub(crate) struct TestFrontend {
-    iron_server: Listening,
     axum_server_thread: JoinHandle<()>,
     axum_server_shutdown_signal: Sender<()>,
     axum_server_address: SocketAddr,
@@ -563,10 +558,6 @@ impl TestFrontend {
         let template_data =
             Arc::new(TemplateData::new(&mut context.pool().unwrap().get().unwrap()).unwrap());
 
-        debug!("starting iron server");
-        let iron_server = start_iron_server(context, template_data.clone(), Some(1))
-            .expect("could not start iron server");
-
         debug!("binding local TCP port for axum");
         let axum_listener =
             TcpListener::bind("127.0.0.1:0".parse::<SocketAddr>().unwrap()).unwrap();
@@ -585,14 +576,7 @@ impl TestFrontend {
                 runtime.block_on(async {
                     axum::Server::from_tcp(axum_listener)
                         .unwrap()
-                        .serve(
-                            axum_app
-                                .fallback_service(
-                                    build_strangler_service(iron_server.socket)
-                                        .expect("could not build strangler service"),
-                                )
-                                .into_make_service(),
-                        )
+                        .serve(axum_app.into_make_service())
                         .with_graceful_shutdown(async {
                             rx.await.ok();
                         })
@@ -603,7 +587,6 @@ impl TestFrontend {
         });
 
         Self {
-            iron_server,
             axum_server_address: axum_addr,
             axum_server_thread: handle,
             axum_server_shutdown_signal: tx,
@@ -623,16 +606,6 @@ impl TestFrontend {
         self.axum_server_thread
             .join()
             .expect("could not join axum background thread");
-
-        trace!("forgetting about iron");
-        // Iron is bugged, and it never closes the server even when the listener is dropped. To
-        // avoid never-ending tests this method forgets about the server, leaking it and allowing the
-        // program to end.
-        //
-        // The OS will then close all the dangling servers once the process exits.
-        //
-        // https://docs.rs/iron/0.5/iron/struct.Listening.html#method.close
-        std::mem::forget(self.iron_server);
     }
 
     fn build_url(&self, url: &str) -> String {
diff --git a/src/web/cache.rs b/src/web/cache.rs
index e12b59e9c..dede7dead 100644
--- a/src/web/cache.rs
+++ b/src/web/cache.rs
@@ -1,19 +1,19 @@
-use super::STATIC_FILE_CACHE_DURATION;
 use crate::config::Config;
 use axum::{
     http::Request as AxumHttpRequest, middleware::Next, response::Response as AxumResponse,
 };
-use http::header::CACHE_CONTROL;
-use iron::{
-    headers::{CacheControl, CacheDirective},
-    AfterMiddleware, IronResult, Request, Response,
-};
+use http::{header::CACHE_CONTROL, HeaderValue};
 use std::sync::Arc;
 
-#[cfg(test)]
-pub const NO_CACHE: &str = "max-age=0";
+pub static NO_CACHING: HeaderValue = HeaderValue::from_static("max-age=0");
+
+pub static NO_STORE_MUST_REVALIDATE: HeaderValue =
+    HeaderValue::from_static("no-cache, no-store, must-revalidate, max-age=0");
+
+pub static FOREVER_IN_CDN_AND_BROWSER: HeaderValue = HeaderValue::from_static("max-age=31104000");
 
 /// defines the wanted caching behaviour for a web response.
+#[derive(Debug)]
 pub enum CachePolicy {
     /// no browser or CDN caching.
     /// In some cases the browser might still use cached content,
@@ -42,81 +42,26 @@ pub enum CachePolicy {
 }
 
 impl CachePolicy {
-    pub fn render(&self, config: &Config) -> Vec<CacheDirective> {
+    pub fn render(&self, config: &Config) -> Option<HeaderValue> {
         match *self {
-            CachePolicy::NoCaching => {
-                vec![CacheDirective::MaxAge(0)]
-            }
-            CachePolicy::NoStoreMustRevalidate => {
-                vec![
-                    CacheDirective::NoCache,
-                    CacheDirective::NoStore,
-                    CacheDirective::MustRevalidate,
-                    CacheDirective::MaxAge(0),
-                ]
-            }
-            CachePolicy::ForeverInCdnAndBrowser => {
-                vec![CacheDirective::MaxAge(STATIC_FILE_CACHE_DURATION as u32)]
-            }
+            CachePolicy::NoCaching => Some(NO_CACHING.clone()),
+            CachePolicy::NoStoreMustRevalidate => Some(NO_STORE_MUST_REVALIDATE.clone()),
+            CachePolicy::ForeverInCdnAndBrowser => Some(FOREVER_IN_CDN_AND_BROWSER.clone()),
             CachePolicy::ForeverInCdn => {
                 // A missing `max-age` or `s-maxage` in the Cache-Control header will lead to
                 // CloudFront using the default TTL, while the browser not seeing any caching header.
                 // This means we can have the CDN caching the documentation while just
                 // issuing a purge after a build.
                 // https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/Expiration.html#ExpirationDownloadDist
-                vec![]
-            }
-            CachePolicy::ForeverInCdnAndStaleInBrowser => {
-                let mut directives = CachePolicy::ForeverInCdn.render(config);
-                if let Some(seconds) = config.cache_control_stale_while_revalidate {
-                    directives.push(CacheDirective::Extension(
-                        "stale-while-revalidate".to_string(),
-                        Some(seconds.to_string()),
-                    ));
-                }
-                directives
+                None
             }
+            CachePolicy::ForeverInCdnAndStaleInBrowser => config
+                .cache_control_stale_while_revalidate
+                .map(|seconds| format!("stale-while-revalidate={seconds}").parse().unwrap()),
         }
     }
 }
 
-impl iron::typemap::Key for CachePolicy {
-    type Value = CachePolicy;
-}
-
-/// Middleware to ensure a correct cache-control header.
-/// The default is an explicit "never cache" header, which
-/// can be adapted via:
-/// ```ignore
-///  resp.extensions.insert::<CachePolicy>(CachePolicy::ForeverInCdn);
-///  # change Cache::ForeverInCdn into the cache polity you want to have
-/// ```
-/// in a handler function.
-pub(super) struct CacheMiddleware;
-
-impl AfterMiddleware for CacheMiddleware {
-    fn after(&self, req: &mut Request, mut res: Response) -> IronResult<Response> {
-        let config = req.extensions.get::<Config>().expect("missing config");
-        let cache = res
-            .extensions
-            .get::<CachePolicy>()
-            .unwrap_or(&CachePolicy::NoCaching);
-
-        if cfg!(test) {
-            assert!(
-                !res.headers.has::<CacheControl>(),
-                "handlers should never set their own caching headers and only use CachePolicy to control caching."
-            );
-        }
-
-        let directives = cache.render(config);
-        if !directives.is_empty() {
-            res.headers.set(CacheControl(directives))
-        }
-        Ok(res)
-    }
-}
-
 pub(crate) async fn cache_middleware<B>(req: AxumHttpRequest<B>, next: Next<B>) -> AxumResponse {
     let config = req
         .extensions()
@@ -138,15 +83,10 @@ pub(crate) async fn cache_middleware<B>(req: AxumHttpRequest<B>, next: Next<B>)
         );
     }
 
-    let directives = cache.render(&config);
-    if !directives.is_empty() {
-        response.headers_mut().insert(
-            CACHE_CONTROL,
-            CacheControl(directives)
-                .to_string()
-                .parse()
-                .expect("cache-control header could not be parsed"),
-        );
+    if let Some(cache_directive) = cache.render(&config) {
+        response
+            .headers_mut()
+            .insert(CACHE_CONTROL, cache_directive);
     }
     response
 }
@@ -155,25 +95,24 @@ pub(crate) async fn cache_middleware<B>(req: AxumHttpRequest<B>, next: Next<B>)
 mod tests {
     use super::*;
     use crate::test::wrapper;
-    use iron::headers::CacheControl;
     use test_case::test_case;
 
-    #[test_case(CachePolicy::NoCaching, "max-age=0")]
+    #[test_case(CachePolicy::NoCaching, Some("max-age=0"))]
     #[test_case(
         CachePolicy::NoStoreMustRevalidate,
-        "no-cache, no-store, must-revalidate, max-age=0"
+        Some("no-cache, no-store, must-revalidate, max-age=0")
     )]
-    #[test_case(CachePolicy::ForeverInCdnAndBrowser, "max-age=31104000")]
-    #[test_case(CachePolicy::ForeverInCdn, "")]
+    #[test_case(CachePolicy::ForeverInCdnAndBrowser, Some("max-age=31104000"))]
+    #[test_case(CachePolicy::ForeverInCdn, None)]
     #[test_case(
         CachePolicy::ForeverInCdnAndStaleInBrowser,
-        "stale-while-revalidate=86400"
+        Some("stale-while-revalidate=86400")
     )]
-    fn render(cache: CachePolicy, expected: &str) {
+    fn render(cache: CachePolicy, expected: Option<&str>) {
         wrapper(|env| {
             assert_eq!(
-                CacheControl(cache.render(&env.config())).to_string(),
-                expected
+                cache.render(&env.config()),
+                expected.map(|s| HeaderValue::from_str(s).unwrap())
             );
             Ok(())
         });
@@ -184,11 +123,9 @@ mod tests {
         wrapper(|env| {
             env.override_config(|config| config.cache_control_stale_while_revalidate = None);
 
-            assert_eq!(
-                CacheControl(CachePolicy::ForeverInCdnAndStaleInBrowser.render(&env.config()))
-                    .to_string(),
-                ""
-            );
+            assert!(CachePolicy::ForeverInCdnAndStaleInBrowser
+                .render(&env.config())
+                .is_none());
             Ok(())
         });
     }
@@ -200,8 +137,9 @@ mod tests {
             });
 
             assert_eq!(
-                CacheControl(CachePolicy::ForeverInCdnAndStaleInBrowser.render(&env.config()))
-                    .to_string(),
+                CachePolicy::ForeverInCdnAndStaleInBrowser
+                    .render(&env.config())
+                    .unwrap(),
                 "stale-while-revalidate=666"
             );
             Ok(())
diff --git a/src/web/csp.rs b/src/web/csp.rs
index b53590c46..47a4f5c74 100644
--- a/src/web/csp.rs
+++ b/src/web/csp.rs
@@ -2,12 +2,17 @@ use crate::config::Config;
 use axum::{
     http::Request as AxumHttpRequest, middleware::Next, response::Response as AxumResponse,
 };
-use iron::{AfterMiddleware, BeforeMiddleware, IronResult, Request, Response};
-use std::{fmt::Write, sync::Arc};
+use std::{
+    fmt::Write,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc,
+    },
+};
 
-pub(super) struct Csp {
+pub(crate) struct Csp {
     nonce: String,
-    suppress: bool,
+    suppress: AtomicBool,
 }
 
 impl Csp {
@@ -19,12 +24,12 @@ impl Csp {
 
         Self {
             nonce: base64::encode(random),
-            suppress: false,
+            suppress: AtomicBool::new(false),
         }
     }
 
-    pub(super) fn suppress(&mut self, suppress: bool) {
-        self.suppress = suppress;
+    pub(super) fn suppress(&self, suppress: bool) {
+        self.suppress.store(suppress, Ordering::Relaxed);
     }
 
     pub(super) fn nonce(&self) -> &str {
@@ -32,7 +37,7 @@ impl Csp {
     }
 
     fn render(&self, content_type: ContentType) -> Option<String> {
-        if self.suppress {
+        if self.suppress.load(Ordering::Relaxed) {
             return None;
         }
         let mut result = String::new();
@@ -83,63 +88,12 @@ impl Csp {
     }
 }
 
-impl iron::typemap::Key for Csp {
-    type Value = Csp;
-}
-
 enum ContentType {
     Html,
     Svg,
     Other,
 }
 
-pub(super) struct CspMiddleware;
-
-impl BeforeMiddleware for CspMiddleware {
-    fn before(&self, req: &mut Request) -> IronResult<()> {
-        req.extensions.insert::<Csp>(Csp::new());
-        Ok(())
-    }
-}
-
-impl AfterMiddleware for CspMiddleware {
-    fn after(&self, req: &mut Request, mut res: Response) -> IronResult<Response> {
-        let config = req
-            .extensions
-            .get::<Config>()
-            .expect("missing Config")
-            .clone();
-        let csp = req.extensions.get_mut::<Csp>().expect("missing CSP");
-
-        let content_type = res
-            .headers
-            .get_raw("Content-Type")
-            .and_then(|headers| headers.get(0))
-            .map(|header| header.as_slice());
-
-        let preset = match content_type {
-            Some(b"text/html; charset=utf-8") => ContentType::Html,
-            Some(b"text/svg+xml") => ContentType::Svg,
-            _ => ContentType::Other,
-        };
-
-        if let Some(rendered) = csp.render(preset) {
-            res.headers.set_raw(
-                // The Report-Only header tells the browser to just log CSP failures instead of
-                // actually enforcing them. This is useful to check if the CSP works without
-                // impacting production traffic.
-                if config.csp_report_only {
-                    "Content-Security-Policy-Report-Only"
-                } else {
-                    "Content-Security-Policy"
-                },
-                vec![rendered.as_bytes().to_vec()],
-            );
-        }
-        Ok(res)
-    }
-}
-
 pub(crate) async fn csp_middleware<B>(mut req: AxumHttpRequest<B>, next: Next<B>) -> AxumResponse {
     let csp_report_only = req
         .extensions()
@@ -199,7 +153,7 @@ mod tests {
 
     #[test]
     fn test_csp_suppressed() {
-        let mut csp = Csp::new();
+        let csp = Csp::new();
         csp.suppress(true);
 
         assert!(csp.render(ContentType::Other).is_none());
diff --git a/src/web/error.rs b/src/web/error.rs
index b3bcf8f64..1137e9548 100644
--- a/src/web/error.rs
+++ b/src/web/error.rs
@@ -1,116 +1,10 @@
 use std::borrow::Cow;
 
-use crate::{
-    db::PoolError,
-    web::{page::WebPage, releases::Search, AxumErrorPage, ErrorPage},
-};
+use crate::web::{releases::Search, AxumErrorPage};
 use axum::{
     http::StatusCode,
     response::{IntoResponse, Response as AxumResponse},
 };
-use iron::{status::Status, Handler, IronError, IronResult, Request, Response};
-
-#[derive(Debug, Copy, Clone, thiserror::Error)]
-pub enum Nope {
-    #[error("Requested resource not found")]
-    ResourceNotFound,
-    #[error("Requested build not found")]
-    BuildNotFound,
-    #[error("Requested crate not found")]
-    CrateNotFound,
-    #[error("Requested owner not found")]
-    OwnerNotFound,
-    #[error("Requested crate does not have specified version")]
-    VersionNotFound,
-    #[error("Internal server error")]
-    InternalServerError,
-}
-
-impl From<Nope> for IronError {
-    fn from(err: Nope) -> IronError {
-        use iron::status;
-
-        let status = match err {
-            Nope::ResourceNotFound
-            | Nope::BuildNotFound
-            | Nope::CrateNotFound
-            | Nope::OwnerNotFound
-            | Nope::VersionNotFound => status::NotFound,
-            Nope::InternalServerError => status::InternalServerError,
-        };
-
-        IronError::new(err, status)
-    }
-}
-
-impl Handler for Nope {
-    fn handle(&self, req: &mut Request) -> IronResult<Response> {
-        match self {
-            Nope::ResourceNotFound => {
-                // user tried to navigate to a resource (doc page/file) that doesn't exist
-                // TODO: Display the attempted page
-                ErrorPage {
-                    title: "The requested resource does not exist",
-                    message: Some("no such resource".into()),
-                    status: Status::NotFound,
-                }
-                .into_response(req)
-            }
-
-            Nope::BuildNotFound => ErrorPage {
-                title: "The requested build does not exist",
-                message: Some("no such build".into()),
-                status: Status::NotFound,
-            }
-            .into_response(req),
-
-            Nope::CrateNotFound => {
-                // user tried to navigate to a crate that doesn't exist
-                // TODO: Display the attempted crate and a link to a search for said crate
-                ErrorPage {
-                    title: "The requested crate does not exist",
-                    message: Some("no such crate".into()),
-                    status: Status::NotFound,
-                }
-                .into_response(req)
-            }
-
-            Nope::OwnerNotFound => ErrorPage {
-                title: "The requested owner does not exist",
-                message: Some("no such owner".into()),
-                status: Status::NotFound,
-            }
-            .into_response(req),
-
-            Nope::VersionNotFound => {
-                // user tried to navigate to a crate with a version that does not exist
-                // TODO: Display the attempted crate and version
-                ErrorPage {
-                    title: "The requested version does not exist",
-                    message: Some("no such version for this crate".into()),
-                    status: Status::NotFound,
-                }
-                .into_response(req)
-            }
-
-            Nope::InternalServerError => {
-                // something went wrong, details should have been logged
-                ErrorPage {
-                    title: "Internal server error",
-                    message: Some("internal server error".into()),
-                    status: Status::InternalServerError,
-                }
-                .into_response(req)
-            }
-        }
-    }
-}
-
-impl From<PoolError> for IronError {
-    fn from(err: PoolError) -> IronError {
-        IronError::new(err, Status::InternalServerError)
-    }
-}
 
 #[derive(Debug, thiserror::Error)]
 #[allow(dead_code)] // FIXME: remove after iron is gone
@@ -131,6 +25,8 @@ pub enum AxumNope {
     InternalServerError,
     #[error("internal error")]
     InternalError(anyhow::Error),
+    #[error("bad request")]
+    BadRequest,
 }
 
 impl IntoResponse for AxumNope {
@@ -139,7 +35,7 @@ impl IntoResponse for AxumNope {
             AxumNope::ResourceNotFound => {
                 // user tried to navigate to a resource (doc page/file) that doesn't exist
                 AxumErrorPage {
-                    title: "Requested resource does not exist",
+                    title: "The requested resource does not exist",
                     message: "no such resource".into(),
                     status: StatusCode::NOT_FOUND,
                 }
@@ -190,6 +86,12 @@ impl IntoResponse for AxumNope {
                 }
                 .into_response()
             }
+            AxumNope::BadRequest => AxumErrorPage {
+                title: "Bad request",
+                message: "Bad request".into(),
+                status: StatusCode::BAD_REQUEST,
+            }
+            .into_response(),
             AxumNope::InternalServerError => {
                 // something went wrong, details should have been logged
                 AxumErrorPage {
@@ -218,23 +120,7 @@ impl From<anyhow::Error> for AxumNope {
     fn from(err: anyhow::Error) -> Self {
         match err.downcast::<AxumNope>() {
             Ok(axum_nope) => axum_nope,
-            Err(err) => match err.downcast::<Nope>() {
-                Ok(iron_nope) => AxumNope::from(iron_nope),
-                Err(err) => AxumNope::InternalError(err),
-            },
-        }
-    }
-}
-
-impl From<Nope> for AxumNope {
-    fn from(err: Nope) -> Self {
-        match err {
-            Nope::ResourceNotFound => AxumNope::ResourceNotFound,
-            Nope::BuildNotFound => AxumNope::BuildNotFound,
-            Nope::CrateNotFound => AxumNope::CrateNotFound,
-            Nope::OwnerNotFound => AxumNope::OwnerNotFound,
-            Nope::VersionNotFound => AxumNope::VersionNotFound,
-            Nope::InternalServerError => AxumNope::InternalServerError,
+            Err(err) => AxumNope::InternalError(err),
         }
     }
 }
diff --git a/src/web/extensions.rs b/src/web/extensions.rs
deleted file mode 100644
index 709b694ed..000000000
--- a/src/web/extensions.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use crate::web::page::TemplateData;
-use crate::{
-    db::Pool, repositories::RepositoryStatsUpdater, BuildQueue, Config, Context, Metrics, Storage,
-};
-use anyhow::Error;
-use iron::{BeforeMiddleware, IronResult, Request};
-use std::sync::Arc;
-
-#[derive(Debug, Clone)]
-pub(super) struct InjectExtensions {
-    build_queue: Arc<BuildQueue>,
-    pool: Pool,
-    config: Arc<Config>,
-    storage: Arc<Storage>,
-    metrics: Arc<Metrics>,
-    template_data: Arc<TemplateData>,
-    repository_stats_updater: Arc<RepositoryStatsUpdater>,
-}
-
-impl InjectExtensions {
-    pub(super) fn new(
-        context: &dyn Context,
-        template_data: Arc<TemplateData>,
-    ) -> Result<Self, Error> {
-        Ok(Self {
-            build_queue: context.build_queue()?,
-            pool: context.pool()?,
-            config: context.config()?,
-            storage: context.storage()?,
-            metrics: context.metrics()?,
-            repository_stats_updater: context.repository_stats_updater()?,
-            template_data,
-        })
-    }
-}
-
-impl BeforeMiddleware for InjectExtensions {
-    fn before(&self, req: &mut Request) -> IronResult<()> {
-        req.extensions
-            .insert::<BuildQueue>(self.build_queue.clone());
-        req.extensions.insert::<Pool>(self.pool.clone());
-        req.extensions.insert::<Config>(self.config.clone());
-        req.extensions.insert::<Storage>(self.storage.clone());
-        req.extensions.insert::<Metrics>(self.metrics.clone());
-        req.extensions
-            .insert::<TemplateData>(self.template_data.clone());
-        req.extensions
-            .insert::<RepositoryStatsUpdater>(self.repository_stats_updater.clone());
-
-        Ok(())
-    }
-}
-
-macro_rules! key {
-    ($key:ty => $value:ty) => {
-        impl iron::typemap::Key for $key {
-            type Value = $value;
-        }
-    };
-}
-
-key!(BuildQueue => Arc<BuildQueue>);
-key!(Pool => Pool);
-key!(Config => Arc<Config>);
-key!(Storage => Arc<Storage>);
-key!(Metrics => Arc<Metrics>);
-key!(TemplateData => Arc<TemplateData>);
-key!(RepositoryStatsUpdater => Arc<RepositoryStatsUpdater>);
diff --git a/src/web/file.rs b/src/web/file.rs
index 659072e8b..7f25f745c 100644
--- a/src/web/file.rs
+++ b/src/web/file.rs
@@ -16,7 +16,6 @@ use axum::{
     },
     response::{IntoResponse, Response as AxumResponse},
 };
-use iron::{status, Response};
 use mime::Mime;
 
 #[derive(Debug)]
@@ -33,29 +32,6 @@ impl File {
 
         Ok(File(storage.get(path, max_size)?))
     }
-
-    /// Consumes File and creates a iron response
-    pub(super) fn serve(self) -> Response {
-        use iron::headers::{ContentType, HttpDate, LastModified};
-
-        let mut response = Response::with((status::Ok, self.0.content));
-        response
-            .headers
-            .set(ContentType(self.0.mime.parse().unwrap()));
-
-        // FIXME: This is so horrible
-        response.headers.set(LastModified(HttpDate(
-            time::strptime(
-                &self.0.date_updated.format("%a, %d %b %Y %T %Z").to_string(),
-                "%a, %d %b %Y %T %Z",
-            )
-            .unwrap(),
-        )));
-        response
-            .extensions
-            .insert::<CachePolicy>(CachePolicy::ForeverInCdnAndBrowser);
-        response
-    }
 }
 
 impl IntoResponse for File {
@@ -87,38 +63,6 @@ mod tests {
     use crate::{test::wrapper, web::cache::CachePolicy};
     use chrono::Utc;
     use http::header::CACHE_CONTROL;
-    use iron::headers::CacheControl;
-
-    #[test]
-    fn file_roundtrip() {
-        wrapper(|env| {
-            let now = Utc::now();
-
-            env.fake_release().create()?;
-
-            let mut file = File::from_path(
-                &env.storage(),
-                "rustdoc/fake-package/1.0.0/fake-package/index.html",
-                &env.config(),
-            )
-            .unwrap();
-            file.0.date_updated = now;
-
-            let resp = file.serve();
-            assert!(resp.headers.get::<CacheControl>().is_none());
-            let cache = resp
-                .extensions
-                .get::<CachePolicy>()
-                .expect("missing cache response extension");
-            assert!(matches!(cache, CachePolicy::ForeverInCdnAndBrowser));
-            assert_eq!(
-                resp.headers.get_raw("Last-Modified").unwrap(),
-                [now.format("%a, %d %b %Y %T GMT").to_string().into_bytes()].as_ref(),
-            );
-
-            Ok(())
-        });
-    }
 
     #[test]
     fn file_roundtrip_axum() {
diff --git a/src/web/metrics.rs b/src/web/metrics.rs
index a871a2a5e..843e11bc4 100644
--- a/src/web/metrics.rs
+++ b/src/web/metrics.rs
@@ -11,7 +11,6 @@ use axum::{
     middleware::Next,
     response::IntoResponse,
 };
-use iron::prelude::*;
 use prometheus::{Encoder, HistogramVec, TextEncoder};
 use std::{
     borrow::Cow,
@@ -94,40 +93,6 @@ pub(crate) async fn request_recorder<B>(
     result
 }
 
-pub(super) struct RequestRecorder {
-    handler: Box<dyn iron::Handler>,
-    route_name: String,
-}
-
-impl RequestRecorder {
-    pub fn new(handler: impl iron::Handler, route: impl Into<String>) -> Self {
-        Self {
-            handler: Box::new(handler),
-            route_name: route.into(),
-        }
-    }
-}
-
-impl iron::Handler for RequestRecorder {
-    fn handle(&self, request: &mut Request) -> IronResult<Response> {
-        let start = Instant::now();
-        let result = self.handler.handle(request);
-        let resp_time = duration_to_seconds(start.elapsed());
-
-        let metrics = extension!(request, Metrics);
-        metrics
-            .routes_visited
-            .with_label_values(&[&self.route_name])
-            .inc();
-        metrics
-            .response_time
-            .with_label_values(&[&self.route_name])
-            .observe(resp_time);
-
-        result
-    }
-}
-
 struct RenderingTime {
     start: Instant,
     step: &'static str,
diff --git a/src/web/mod.rs b/src/web/mod.rs
index b651b63cd..880c4a5a9 100644
--- a/src/web/mod.rs
+++ b/src/web/mod.rs
@@ -3,82 +3,17 @@
 pub mod page;
 
 use crate::utils::get_correct_docsrs_style_file;
-use crate::utils::{report_error, spawn_blocking};
+use crate::utils::spawn_blocking;
 use anyhow::{anyhow, bail, Context as _, Result};
 use serde_json::Value;
 use tracing::{info, instrument};
 
-/// ctry! (cratesfyitry) is extremely similar to try! and itry!
-/// except it returns an error page response instead of plain Err.
-#[macro_export]
-macro_rules! ctry {
-    ($req:expr, $result:expr $(,)?) => {
-        match $result {
-            Ok(success) => success,
-            Err(error) => {
-                let request: &::iron::Request = $req;
-
-                // This is very ugly, but it makes it impossible to get a type inference error
-                // from this macro
-                let web_error = $crate::web::ErrorPage {
-                    title: "Internal Server Error",
-                    message: ::std::option::Option::Some(::std::borrow::Cow::Owned(error.to_string())),
-                    status: ::iron::status::InternalServerError,
-                };
-
-                let error = anyhow::anyhow!(error)
-                    .context(format!("called `ctry!()` on an `Err` value while attempting to fetch the route {:?}", request.url));
-                $crate::utils::report_error(&error);
-
-                return $crate::web::page::WebPage::into_response(web_error, request);
-            }
-        }
-    };
-}
-
-/// cexpect will check an option and if it's not Some
-/// it will return an error page response
-macro_rules! cexpect {
-    ($req:expr, $option:expr $(,)?) => {
-        match $option {
-            Some(success) => success,
-            None => {
-                let request: &::iron::Request = $req;
-
-                // This is very ugly, but it makes it impossible to get a type inference error
-                // from this macro
-                let web_error = $crate::web::ErrorPage {
-                    title: "Internal Server Error",
-                    message: None,
-                    status: ::iron::status::InternalServerError,
-                };
-
-                let error = anyhow::anyhow!("called `cexpect!()` on a `None` value while attempting to fetch the route {:?}", request.url);
-                $crate::utils::report_error(&error);
-
-                return $crate::web::page::WebPage::into_response(web_error, request);
-            }
-        }
-    };
-}
-
-/// Gets an extension from Request
-macro_rules! extension {
-    ($req:expr, $ext:ty) => {{
-        // Bind $req so we can have good type errors and avoid re-evaluation
-        let request: &::iron::Request = $req;
-
-        cexpect!(request, request.extensions.get::<$ext>())
-    }};
-}
-
 mod build_details;
 mod builds;
 pub(crate) mod cache;
 pub(crate) mod crate_details;
 mod csp;
 pub(crate) mod error;
-mod extensions;
 mod features;
 mod file;
 mod headers;
@@ -91,175 +26,26 @@ mod rustdoc;
 mod sitemap;
 mod source;
 mod statics;
-mod strangler;
 
-use crate::{db::Pool, impl_axum_webpage, impl_webpage, Context};
+use crate::{db::Pool, impl_axum_webpage, Context};
 use anyhow::Error;
 use axum::{
-    extract::Extension,
-    http::{uri::Authority, StatusCode},
-    middleware,
-    response::IntoResponse,
-    Router as AxumRouter,
+    extract::Extension, http::StatusCode, middleware, response::IntoResponse, Router as AxumRouter,
 };
 use chrono::{DateTime, Utc};
-use csp::CspMiddleware;
-use error::Nope;
-use extensions::InjectExtensions;
-use iron::{
-    self,
-    headers::{Expires, HttpDate},
-    modifiers::Redirect,
-    status,
-    status::Status,
-    Chain, Handler, Iron, IronError, IronResult, Listening, Request, Response, Url,
-};
+use error::AxumNope;
 use page::TemplateData;
 use postgres::Client;
-use router::{NoRoute, TrailingSlash};
 use semver::{Version, VersionReq};
 use serde::Serialize;
 use std::borrow::Borrow;
 use std::{borrow::Cow, net::SocketAddr, sync::Arc};
-use strangler::StranglerService;
 use tower::ServiceBuilder;
 use tower_http::trace::TraceLayer;
 use url::form_urlencoded;
 
-/// Duration of static files for staticfile and DatabaseFileHandler (in seconds)
-const STATIC_FILE_CACHE_DURATION: u64 = 60 * 60 * 24 * 30 * 12; // 12 months
-
 const DEFAULT_BIND: &str = "0.0.0.0:3000";
 
-pub(crate) struct MainHandler {
-    shared_resource_handler: Box<dyn Handler>,
-    router_handler: Box<dyn Handler>,
-    inject_extensions: InjectExtensions,
-}
-
-impl MainHandler {
-    fn chain<H: Handler>(inject_extensions: InjectExtensions, base: H) -> Chain {
-        let mut chain = Chain::new(base);
-        chain.link_before(inject_extensions);
-
-        chain.link_before(CspMiddleware);
-        chain.link_after(CspMiddleware);
-        chain.link_after(cache::CacheMiddleware);
-
-        chain
-    }
-
-    pub(crate) fn new(
-        template_data: Arc<TemplateData>,
-        context: &dyn Context,
-    ) -> Result<MainHandler, Error> {
-        let inject_extensions = InjectExtensions::new(context, template_data)?;
-
-        let routes = routes::build_routes();
-        let shared_resources = Self::chain(
-            inject_extensions.clone(),
-            rustdoc::LegacySharedResourceHandler,
-        );
-        let router_chain = Self::chain(inject_extensions.clone(), routes.iron_router());
-
-        Ok(MainHandler {
-            shared_resource_handler: Box::new(shared_resources),
-            router_handler: Box::new(router_chain),
-            inject_extensions,
-        })
-    }
-}
-
-impl Handler for MainHandler {
-    fn handle(&self, req: &mut Request) -> IronResult<Response> {
-        fn if_404(
-            e: IronError,
-            handle: impl FnOnce() -> IronResult<Response>,
-        ) -> IronResult<Response> {
-            if e.response.status == Some(status::NotFound) {
-                // the routes are ordered from least specific to most; give precedence to the
-                // new error message.
-                handle()
-            } else {
-                Err(e)
-            }
-        }
-
-        // This is kind of a mess.
-        //
-        // Some versions of rustdoc in 2018 did not respect the shared static root
-        // (--static-root-path) and so emitted HTML that linked to shared static files via a local
-        // path. For instance, `<script src="../main-20181217-1.33.0-nightly-adbfec229.js">` instead
-        // of (correct) `<script src="/main-20181217-1.33.0-nightly-adbfec229.js">`. Since docs.rs
-        // removes the shared static files from individual builds to save space, the "../mainXXX.js"
-        // path doesn't really exist in storage for any particular build. The appropriate main file
-        // *does* exist in the storage root, which is where the shared static files are put for each
-        // new rustdoc version. So here we give LegacySharedResourceHandler a chance to handle all URLs
-        // before they go to the router. LegacySharedResourceHandler looks at the last component of the
-        // request path ("main-20181217-1.33.0-nightly-adbfec229.js") and tries to fetch it from
-        // the storage root (if it's JS, CSS, etc). If the file doesn't exist, we fall through to
-        // the normal router, which may wind up serving an invocation-specific file from the crate
-        // itself. For instance, a request for "/crate/foo/search-index-XYZ.js" will get a 404 from
-        // the LegacySharedResourceHandler because "search-index-XYZ.js" doesn't exist in the storage root
-        // (it's not a shared static file), but it will get a 200 from rustdoc_html_server_handler
-        // because it exists in a specific crate.
-        //
-        // See #1181.
-        //
-        // Note that this causes a counterintuitive and arguably buggy behavior: files that exist in
-        // the storage root can be requested with any path. For instance:
-        //
-        // https://docs.rs/this.path.does.not.exist/main-20181217-1.33.0-nightly-adbfec229.js
-        //
-        // If those 2018 crates get rebuilt, we won't have this problem anymore, and
-        // LegacySharedResourceHandler can receive dispatch from the router, as other handlers do. That
-        // will also allow LegacySharedResourceHandler to look up full paths in storage rather than just
-        // the last component of the requested path.
-        //
-        // Also note: this approach means that a request for a given JS/CSS may serve from two
-        // different places in storage: the storage root, or the full requested path. If the same
-        // filename exists in both places, we serve that filename from the storage root, because
-        // shared_resource_handler is called before the router. This works around a different bug
-        // that existed in certain versions of rustdoc around 2021, where an invocation specific
-        // file (cratesXXX.js) was referenced using the --static-root-path rather than the crate
-        // root. See #1340 and https://github.com/rust-lang/rust/pull/83094.
-        self.shared_resource_handler
-            .handle(req)
-            .or_else(|e| if_404(e, || self.router_handler.handle(req)))
-            .or_else(|e| {
-                // in some cases the iron router will return a redirect as an `IronError`.
-                // Here we convert these into an `Ok(Response)`.
-                if e.error.downcast_ref::<TrailingSlash>().is_some()
-                    || e.response.status == Some(status::MovedPermanently)
-                {
-                    Ok(e.response)
-                } else {
-                    Err(e)
-                }
-            })
-            .or_else(|e| {
-                let err = if let Some(err) = e.error.downcast_ref::<error::Nope>() {
-                    *err
-                } else if e.error.is::<NoRoute>() || e.response.status == Some(status::NotFound) {
-                    error::Nope::ResourceNotFound
-                } else if e.response.status == Some(status::InternalServerError) {
-                    report_error(&anyhow!("internal server error: {}", e.error));
-                    error::Nope::InternalServerError
-                } else {
-                    report_error(&anyhow!(
-                        "No error page for status {:?}; {}",
-                        e.response.status,
-                        e.error
-                    ));
-                    // TODO: add in support for other errors that are actually used
-                    error::Nope::InternalServerError
-                };
-
-                Self::chain(self.inject_extensions.clone(), err).handle(req)
-            })
-    }
-}
-
 #[derive(Debug)]
 struct MatchVersion {
     /// Represents the crate name that was found when attempting to load a crate release.
@@ -276,11 +62,11 @@ impl MatchVersion {
     /// If the matched version was an exact match to the requested crate name, returns the
     /// `MatchSemver` for the query. If the lookup required a dash/underscore conversion, returns
     /// `CrateNotFound`.
-    fn assume_exact(self) -> Result<MatchSemver, Nope> {
+    fn assume_exact(self) -> Result<MatchSemver, AxumNope> {
         if self.corrected_name.is_none() {
             Ok(self.version)
         } else {
-            Err(Nope::CrateNotFound)
+            Err(AxumNope::CrateNotFound)
         }
     }
 }
@@ -322,7 +108,7 @@ fn match_version(
     conn: &mut Client,
     name: &str,
     input_version: Option<&str>,
-) -> Result<MatchVersion, Nope> {
+) -> Result<MatchVersion, AxumNope> {
     let (crate_id, corrected_name) = {
         let rows = conn
             .query(
@@ -333,7 +119,7 @@ fn match_version(
             )
             .unwrap(); // FIXME: remove this unwrap when all handlers using it are migrated to axum
 
-        let row = rows.get(0).ok_or(Nope::CrateNotFound)?;
+        let row = rows.get(0).ok_or(AxumNope::CrateNotFound)?;
 
         let id: i32 = row.get(0);
         let db_name = row.get(1);
@@ -351,18 +137,15 @@ fn match_version(
         .expect("error fetching releases for crate");
 
     if releases.is_empty() {
-        return Err(Nope::CrateNotFound);
+        return Err(AxumNope::CrateNotFound);
     }
 
     // version is an Option<&str> from router::Router::get, need to decode first.
     // Any encoding errors we treat as _any version_.
-    use iron::url::percent_encoding::percent_decode;
-    let req_version = input_version
-        .and_then(|v| percent_decode(v.as_bytes()).decode_utf8().ok())
-        .unwrap_or_else(|| "*".into());
+    let req_version = input_version.unwrap_or("*");
 
     // first check for exact match, we can't expect users to use semver in query
-    if let Ok(parsed_req_version) = Version::parse(&req_version) {
+    if let Ok(parsed_req_version) = Version::parse(req_version) {
         if let Some(release) = releases
             .iter()
             .find(|release| release.version == parsed_req_version)
@@ -380,12 +163,12 @@ fn match_version(
     let req_semver = if req_version == "newest" || req_version == "latest" {
         VersionReq::STAR
     } else {
-        VersionReq::parse(&req_version).map_err(|err| {
+        VersionReq::parse(req_version).map_err(|err| {
             info!(
                 "could not parse version requirement \"{}\": {:?}",
                 req_version, err
             );
-            Nope::VersionNotFound
+            AxumNope::VersionNotFound
         })?
     };
 
@@ -421,13 +204,13 @@ fn match_version(
                 rustdoc_status: release.rustdoc_status,
                 target_name: release.target_name.clone(),
             })
-            .ok_or(Nope::VersionNotFound);
+            .ok_or(AxumNope::VersionNotFound);
     }
 
     // Since we return with a CrateNotFound earlier if the db reply is empty,
     // we know that versions were returned but none satisfied the version requirement.
     // This can only happen when all versions are yanked.
-    Err(Nope::VersionNotFound)
+    Err(AxumNope::VersionNotFound)
 }
 
 // temporary wrapper around `match_version` for axum handlers.
@@ -477,32 +260,10 @@ pub(crate) fn build_axum_app(
     ))
 }
 
-#[instrument(skip_all)]
-pub(crate) fn build_strangler_service(addr: SocketAddr) -> Result<StranglerService, Error> {
-    Ok(StranglerService::new(Authority::try_from(
-        addr.to_string(),
-    )?))
-}
-
-#[instrument(skip_all)]
-pub(crate) fn start_iron_server(
-    context: &dyn Context,
-    template_data: Arc<TemplateData>,
-    threads: Option<usize>,
-) -> Result<Listening, Error> {
-    let mut iron = Iron::new(MainHandler::new(template_data, context)?);
-    if let Some(threads) = threads {
-        iron.threads = threads;
-    }
-    Ok(iron.http("127.0.0.1:0")?)
-}
-
 #[instrument(skip_all)]
 pub fn start_web_server(addr: Option<&str>, context: &dyn Context) -> Result<(), Error> {
     let template_data = Arc::new(TemplateData::new(&mut *context.pool()?.get()?)?);
 
-    let iron_server = start_iron_server(context, template_data.clone(), None)?;
-
     let axum_addr: SocketAddr = addr.unwrap_or(DEFAULT_BIND).parse()?;
 
     tracing::info!(
@@ -511,13 +272,16 @@ pub fn start_web_server(addr: Option<&str>, context: &dyn Context) -> Result<(),
         axum_addr.port()
     );
 
+    // initialize the storage and the repo-updater in sync context
+    // so it can stay sync for now and doesn't fail when they would
+    // be initialized while starting the server below.
+    context.storage()?;
+    context.repository_stats_updater()?;
+
     context.runtime()?.block_on(async {
         axum::Server::bind(&axum_addr)
-            .serve(
-                build_axum_app(context, template_data)?
-                    .fallback_service(build_strangler_service(iron_server.socket)?)
-                    .into_make_service(),
-            )
+            .serve(build_axum_app(context, template_data)?.into_make_service())
+            .with_graceful_shutdown(shutdown_signal())
             .await?;
         Ok::<(), Error>(())
     })?;
@@ -525,6 +289,32 @@ pub fn start_web_server(addr: Option<&str>, context: &dyn Context) -> Result<(),
     Ok(())
 }
 
+async fn shutdown_signal() {
+    let ctrl_c = async {
+        tokio::signal::ctrl_c()
+            .await
+            .expect("failed to install Ctrl+C handler");
+    };
+
+    #[cfg(unix)]
+    let terminate = async {
+        tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
+            .expect("failed to install signal handler")
+            .recv()
+            .await;
+    };
+
+    #[cfg(not(unix))]
+    let terminate = std::future::pending::<()>();
+
+    tokio::select! {
+        _ = ctrl_c => {},
+        _ = terminate => {},
+    }
+
+    info!("signal received, starting graceful shutdown");
+}
+
 /// Converts Timespec to nice readable relative time string
 fn duration_to_str(init: DateTime<Utc>) -> String {
     let now = Utc::now();
@@ -553,17 +343,10 @@ fn duration_to_str(init: DateTime<Utc>) -> String {
     }
 }
 
-/// Creates a `Response` which redirects to the given path on the scheme/host/port from the given
-/// `Request`.
-fn redirect(url: Url) -> Response {
-    let mut resp = Response::with((status::Found, Redirect(url)));
-    resp.headers.set(Expires(HttpDate(time::now())));
-    resp
-}
-
+#[instrument]
 fn axum_redirect<U>(uri: U) -> Result<impl IntoResponse, Error>
 where
-    U: TryInto<http::Uri>,
+    U: TryInto<http::Uri> + std::fmt::Debug,
     <U as TryInto<http::Uri>>::Error: std::fmt::Debug,
 {
     let uri: http::Uri = uri
@@ -588,57 +371,18 @@ where
     ))
 }
 
-fn cached_redirect(url: Url, cache_policy: cache::CachePolicy) -> Response {
-    let mut resp = Response::with((status::Found, Redirect(url)));
-    resp.extensions.insert::<cache::CachePolicy>(cache_policy);
-    resp
-}
-
-fn axum_cached_redirect(
-    url: &str,
+#[instrument]
+fn axum_cached_redirect<U>(
+    uri: U,
     cache_policy: cache::CachePolicy,
-) -> Result<impl IntoResponse, Error> {
-    let mut resp = axum_redirect(url)?.into_response();
-    resp.extensions_mut().insert(cache_policy);
-    Ok(resp)
-}
-
-fn redirect_base(req: &Request) -> String {
-    // Try to get the scheme from CloudFront first, and then from iron
-    let scheme = req
-        .headers
-        .get_raw("cloudfront-forwarded-proto")
-        .and_then(|values| values.get(0))
-        .and_then(|value| std::str::from_utf8(value).ok())
-        .filter(|proto| *proto == "http" || *proto == "https")
-        .unwrap_or_else(|| req.url.scheme());
-
-    // Only include the port if it's needed
-    let port = req.url.port();
-    if port == 80 {
-        format!("{}://{}", scheme, req.url.host())
-    } else {
-        format!("{}://{}:{}", scheme, req.url.host(), port)
-    }
-}
-
-/// Parse and URL into a iron::Url struct.
-/// When `queries` are given these are added to the URL,
-/// with empty `queries` the `?` will be omitted.
-pub(crate) fn parse_url_with_params<I, K, V>(url: &str, queries: I) -> Result<Url, Error>
+) -> Result<impl IntoResponse, Error>
 where
-    I: IntoIterator,
-    I::Item: Borrow<(K, V)>,
-    K: AsRef<str>,
-    V: AsRef<str>,
+    U: TryInto<http::Uri> + std::fmt::Debug,
+    <U as TryInto<http::Uri>>::Error: std::fmt::Debug,
 {
-    let mut queries = queries.into_iter().peekable();
-    if queries.peek().is_some() {
-        Url::from_generic_url(iron::url::Url::parse_with_params(url, queries)?)
-            .map_err(|msg| anyhow!(msg))
-    } else {
-        Url::parse(url).map_err(|msg| anyhow!(msg))
-    }
+    let mut resp = axum_redirect(uri)?.into_response();
+    resp.extensions_mut().insert(cache_policy);
+    Ok(resp)
 }
 
 /// Parse an URI into a http::Uri struct.
@@ -734,21 +478,6 @@ impl MetaData {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize)]
-pub(crate) struct ErrorPage {
-    /// The title of the page
-    pub title: &'static str,
-    /// The error message, displayed as a description
-    pub message: Option<Cow<'static, str>>,
-    #[serde(skip)]
-    pub status: Status,
-}
-
-impl_webpage! {
-    ErrorPage = "error.html",
-    status = |err| err.status,
-}
-
 #[derive(Debug, Clone, PartialEq, Serialize)]
 pub(crate) struct AxumErrorPage {
     /// The title of the page
@@ -931,20 +660,6 @@ mod test {
         })
     }
 
-    #[test]
-    fn double_slash_does_redirect_and_remove_slash() {
-        wrapper(|env| {
-            env.fake_release()
-                .name("bat")
-                .version("0.2.0")
-                .create()
-                .unwrap();
-            let web = env.frontend();
-            assert_redirect_unchecked("/bat//", "/bat/", web)?;
-            Ok(())
-        })
-    }
-
     #[test]
     fn binary_docs_redirect_to_crate() {
         wrapper(|env| {
diff --git a/src/web/page/mod.rs b/src/web/page/mod.rs
index 5d61cf81f..3f8a9d2bf 100644
--- a/src/web/page/mod.rs
+++ b/src/web/page/mod.rs
@@ -2,7 +2,6 @@ mod templates;
 pub(crate) mod web_page;
 
 pub(crate) use templates::TemplateData;
-pub(super) use web_page::WebPage;
 
 use serde::Serialize;
 
diff --git a/src/web/page/web_page.rs b/src/web/page/web_page.rs
index 511ea6827..058b57c48 100644
--- a/src/web/page/web_page.rs
+++ b/src/web/page/web_page.rs
@@ -1,8 +1,7 @@
 use super::TemplateData;
 use crate::{
-    ctry,
     utils::spawn_blocking,
-    web::{cache::CachePolicy, csp::Csp, error::AxumNope},
+    web::{csp::Csp, error::AxumNope},
 };
 use anyhow::Error;
 use axum::{
@@ -13,54 +12,10 @@ use axum::{
 };
 use futures_util::future::{BoxFuture, FutureExt};
 use http::header::CONTENT_LENGTH;
-use iron::{
-    headers::{ContentType, Link, LinkValue, RelationType},
-    response::Response,
-    status::Status,
-    IronResult, Request,
-};
 use serde::Serialize;
-use std::{borrow::Cow, sync::Arc};
+use std::sync::Arc;
 use tera::Context;
 
-/// When making using a custom status, use a closure that coerces to a `fn(&Self) -> Status`
-#[macro_export]
-macro_rules! impl_webpage {
-    ($page:ty = $template:literal $(, status = $status:expr)? $(, content_type = $content_type:expr)?  $(, canonical_url = $canonical_url:expr)? $(,)?) => {
-        $crate::impl_webpage!($page = |_| ::std::borrow::Cow::Borrowed($template) $(, status = $status)? $(, content_type = $content_type)?  $(, canonical_url = $canonical_url)?);
-    };
-
-    ($page:ty = $template:expr $(, status = $status:expr)? $(, content_type = $content_type:expr)? $(, canonical_url = $canonical_url:expr)? $(,)?) => {
-        impl $crate::web::page::WebPage for $page {
-            fn template(&self) -> ::std::borrow::Cow<'static, str> {
-                let template: fn(&Self) -> ::std::borrow::Cow<'static, str> = $template;
-                template(self)
-            }
-
-            $(
-                fn get_status(&self) -> ::iron::status::Status {
-                    let status: fn(&Self) -> ::iron::status::Status = $status;
-                    (status)(self)
-                }
-            )?
-
-
-            $(
-                fn canonical_url(&self) -> Option<String> {
-                    let canonical_url: fn(&Self) -> Option<String> = $canonical_url;
-                    (canonical_url)(self)
-                }
-            )?
-
-            $(
-                fn content_type() -> ::iron::headers::ContentType {
-                    $content_type
-                }
-            )?
-        }
-    };
-}
-
 #[macro_export]
 macro_rules! impl_axum_webpage {
     (
@@ -166,79 +121,6 @@ struct TemplateContext<'a, T> {
     page: &'a T,
 }
 
-/// The central trait that rendering pages revolves around, it handles selecting and rendering the template
-pub trait WebPage: Serialize + Sized {
-    /// Turn the current instance into a `Response`, ready to be served
-    // TODO: We could cache similar pages using the `&Context`
-    fn into_response(self, req: &Request) -> IronResult<Response> {
-        let csp_nonce = req
-            .extensions
-            .get::<Csp>()
-            .expect("missing CSP from the request extensions")
-            .nonce();
-
-        let ctx = Context::from_serialize(&TemplateContext {
-            csp_nonce,
-            page: &self,
-        })
-        .unwrap();
-        let status = self.get_status();
-        let result = req
-            .extensions
-            .get::<TemplateData>()
-            .expect("missing TemplateData from the request extensions")
-            .templates
-            .render(&self.template(), &ctx);
-
-        let rendered = if status.is_server_error() {
-            // avoid infinite loop if error.html somehow fails to load
-            result.expect("error while serving error page")
-        } else {
-            ctry!(req, result)
-        };
-
-        let mut response = Response::with((status, rendered));
-        response.headers.set(Self::content_type());
-        if let Some(cache) = Self::cache_policy() {
-            response.extensions.insert::<CachePolicy>(cache);
-        }
-
-        if let Some(canonical_url) = self.canonical_url() {
-            let link_value = LinkValue::new(canonical_url)
-                .push_rel(RelationType::ExtRelType("canonical".to_string()));
-
-            response.headers.set(Link::new(vec![link_value]));
-        }
-
-        Ok(response)
-    }
-
-    /// The name of the template to be rendered
-    fn template(&self) -> Cow<'static, str>;
-
-    /// The canonical URL to set in response headers
-    fn canonical_url(&self) -> Option<String> {
-        None
-    }
-
-    /// Gets the status of the request, defaults to `Ok`
-    fn get_status(&self) -> Status {
-        Status::Ok
-    }
-
-    /// The content type that the template should be served with, defaults to html
-    fn content_type() -> ContentType {
-        ContentType::html()
-    }
-
-    /// caching for this page.
-    /// `None` leads to the default from the `CacheMiddleware`
-    /// being used.
-    fn cache_policy() -> Option<CachePolicy> {
-        None
-    }
-}
-
 /// adding this to the axum response extensions will lead
 /// to the template being rendered, adding the csp_nonce to
 /// the context.
diff --git a/src/web/routes.rs b/src/web/routes.rs
index b21d0275a..89d31993e 100644
--- a/src/web/routes.rs
+++ b/src/web/routes.rs
@@ -1,6 +1,4 @@
-use super::{
-    cache::CachePolicy, error::AxumNope, metrics::request_recorder, metrics::RequestRecorder,
-};
+use super::{cache::CachePolicy, error::AxumNope, metrics::request_recorder};
 use axum::{
     handler::Handler as AxumHandler,
     http::Request as AxumHttpRequest,
@@ -11,9 +9,7 @@ use axum::{
     Router as AxumRouter,
 };
 use axum_extra::routing::RouterExt;
-use iron::middleware::Handler;
-use router::Router as IronRouter;
-use std::{collections::HashSet, convert::Infallible};
+use std::convert::Infallible;
 use tracing::{debug, instrument};
 
 const INTERNAL_PREFIXES: &[&str] = &["-", "about", "crate", "releases", "sitemap.xml"];
@@ -59,7 +55,6 @@ where
         .layer(middleware::from_fn(block_blacklisted_prefixes_middleware))
 }
 
-#[instrument(skip_all)]
 async fn block_blacklisted_prefixes_middleware<B>(
     request: AxumHttpRequest<B>,
     next: Next<B>,
@@ -70,6 +65,7 @@ async fn block_blacklisted_prefixes_middleware<B>(
         {
             debug!(
                 first_component = first_component,
+                uri = ?request.uri(),
                 "blocking blacklisted prefix"
             );
             return AxumNope::CrateNotFound.into_response();
@@ -80,6 +76,19 @@ async fn block_blacklisted_prefixes_middleware<B>(
 }
 
 pub(super) fn build_axum_routes() -> AxumRouter {
+    // hint for naming axum routes:
+    // when routes overlap, the route parameters at the same position
+    // have to use the same name:
+    //
+    // These routes work together:
+    // - `/:name/:version/settings.html`
+    // - `/:name/:version/:target`
+    // and axum can prioritize the more specific route.
+    //
+    // This panics because of conflicting routes:
+    // - `/:name/:version/settings.html`
+    // - `/:crate/:version/:target`
+    //
     AxumRouter::new()
         // Well known resources, robots.txt and favicon.ico support redirection, the sitemap.xml
         // must live at the site root:
@@ -236,172 +245,54 @@ pub(super) fn build_axum_routes() -> AxumRouter {
             get_internal(super::rustdoc::target_redirect_handler),
         )
         .route(
-            "/:crate/badge.svg",
+            "/:name/badge.svg",
             get_rustdoc(super::rustdoc::badge_handler),
         )
+        .route(
+            "/:name",
+            get_rustdoc(super::rustdoc::rustdoc_redirector_handler),
+        )
+        .route(
+            "/:name/",
+            get_rustdoc(super::rustdoc::rustdoc_redirector_handler),
+        )
+        .route(
+            "/:name/:version",
+            get_rustdoc(super::rustdoc::rustdoc_redirector_handler),
+        )
+        .route(
+            "/:name/:version/",
+            get_rustdoc(super::rustdoc::rustdoc_redirector_handler),
+        )
+        .route(
+            "/:name/:version/all.html",
+            get_rustdoc(super::rustdoc::rustdoc_html_server_handler),
+        )
+        .route(
+            "/:name/:version/settings.html",
+            get_rustdoc(super::rustdoc::rustdoc_html_server_handler),
+        )
+        .route(
+            "/:name/:version/scrape-examples-help.html",
+            get_rustdoc(super::rustdoc::rustdoc_html_server_handler),
+        )
+        .route(
+            "/:name/:version/:target",
+            get_rustdoc(super::rustdoc::rustdoc_redirector_handler),
+        )
+        .route(
+            "/:name/:version/:target/",
+            get_rustdoc(super::rustdoc::rustdoc_html_server_handler),
+        )
+        .route(
+            "/:name/:version/:target/*path",
+            get_rustdoc(super::rustdoc::rustdoc_html_server_handler),
+        )
+        .fallback(fallback)
 }
 
-// REFACTOR: Break this into smaller initialization functions
-pub(super) fn build_routes() -> Routes {
-    let mut routes = Routes::new();
-
-    routes.rustdoc_page("/:crate", super::rustdoc::rustdoc_redirector_handler);
-    routes.rustdoc_page("/:crate/", super::rustdoc::rustdoc_redirector_handler);
-    routes.rustdoc_page(
-        "/:crate/:version",
-        super::rustdoc::rustdoc_redirector_handler,
-    );
-    routes.rustdoc_page(
-        "/:crate/:version/",
-        super::rustdoc::rustdoc_redirector_handler,
-    );
-    routes.rustdoc_page(
-        "/:crate/:version/settings.html",
-        super::rustdoc::rustdoc_html_server_handler,
-    );
-    routes.rustdoc_page(
-        "/:crate/:version/scrape-examples-help.html",
-        super::rustdoc::rustdoc_html_server_handler,
-    );
-    routes.rustdoc_page(
-        "/:crate/:version/all.html",
-        super::rustdoc::rustdoc_html_server_handler,
-    );
-    routes.rustdoc_page(
-        "/:crate/:version/:target",
-        super::rustdoc::rustdoc_redirector_handler,
-    );
-    routes.rustdoc_page(
-        "/:crate/:version/:target/",
-        super::rustdoc::rustdoc_html_server_handler,
-    );
-    routes.rustdoc_page(
-        "/:crate/:version/:target/*.html",
-        super::rustdoc::rustdoc_html_server_handler,
-    );
-
-    for prefix in INTERNAL_PREFIXES {
-        routes.add_internal_page_prefix(prefix);
-    }
-
-    routes
-}
-
-/// This wrapper class aids the construction of iron's Router, with docs.rs-specific additions to
-/// it. Routes are supposed to be added by the build_routes function, which calls methods in this
-/// struct depending on the type of route being added.
-pub(super) struct Routes {
-    /// Normal GET routes.
-    get: Vec<(String, Box<dyn Handler>)>,
-    /// GET routes serving rustdoc content. The BlockBlacklistedPrefixes middleware is added
-    /// automatically to all of them.
-    rustdoc_get: Vec<(String, Box<dyn Handler>)>,
-    /// Prefixes of all the internal routes. This data is used to power the
-    /// BlockBlacklistedPrefixes middleware.
-    page_prefixes: HashSet<String>,
-}
-
-impl Routes {
-    fn new() -> Self {
-        Self {
-            get: Vec::new(),
-            rustdoc_get: Vec::new(),
-            page_prefixes: HashSet::new(),
-        }
-    }
-
-    pub(super) fn page_prefixes(&self) -> HashSet<String> {
-        self.page_prefixes.clone()
-    }
-
-    pub(super) fn add_internal_page_prefix<P: AsRef<str>>(&mut self, prefix: P) {
-        self.page_prefixes.insert(prefix.as_ref().to_string());
-    }
-
-    pub(super) fn iron_router(mut self) -> IronRouter {
-        let mut router = IronRouter::new();
-        for (pattern, handler) in self.get.drain(..) {
-            router.get(&pattern, handler, calculate_id(&pattern));
-        }
-
-        // All rustdoc pages have the prefixes of other docs.rs pages blacklisted. This prevents,
-        // for example, a crate named "about" from hijacking /about/0.1.0/index.html.
-        let blacklist = self.page_prefixes();
-        for (pattern, handler) in self.rustdoc_get.drain(..) {
-            router.get(
-                &pattern,
-                BlockBlacklistedPrefixes::new(blacklist.clone(), handler),
-                calculate_id(&pattern),
-            );
-        }
-
-        router
-    }
-
-    /// A rustdoc page is a page serving generated documentation. It's similar to a static
-    /// resource, but path prefixes are automatically blacklisted (see internal pages to learn more
-    /// about page prefixes).
-    fn rustdoc_page(&mut self, pattern: &str, handler: impl Handler) {
-        self.get.push((
-            pattern.to_string(),
-            Box::new(RequestRecorder::new(handler, "rustdoc page")),
-        ));
-    }
-}
-
-#[derive(Copy, Clone)]
-struct PermanentRedirect(&'static str);
-
-impl Handler for PermanentRedirect {
-    fn handle(&self, _req: &mut iron::Request) -> iron::IronResult<iron::Response> {
-        Ok(iron::Response::with((
-            iron::status::MovedPermanently,
-            iron::modifiers::RedirectRaw(self.0.to_owned()),
-        )))
-    }
-}
-
-/// Iron Middleware that prevents requests to blacklisted prefixes.
-///
-/// In our application, a prefix is blacklisted if a docs.rs page exists below it. For example,
-/// since /releases/queue is a docs.rs page, /releases is a blacklisted prefix.
-///
-/// The middleware must be used for all the pages serving crates at the top level, to prevent a
-/// crate from putting their own content in an URL that's supposed to be used by docs.rs.
-pub(super) struct BlockBlacklistedPrefixes {
-    blacklist: HashSet<String>,
-    handler: Box<dyn Handler>,
-}
-
-impl BlockBlacklistedPrefixes {
-    pub(super) fn new(blacklist: HashSet<String>, handler: Box<dyn Handler>) -> Self {
-        Self { blacklist, handler }
-    }
-}
-
-impl Handler for BlockBlacklistedPrefixes {
-    fn handle(&self, req: &mut iron::Request) -> iron::IronResult<iron::Response> {
-        if let Some(prefix) = req.url.path().first() {
-            if self.blacklist.contains(*prefix) {
-                return Err(super::error::Nope::CrateNotFound.into());
-            }
-        }
-        self.handler.handle(req)
-    }
-}
-
-/// Automatically generate a Route ID from a pattern. Every non-alphanumeric character is replaced
-/// with `_`.
-fn calculate_id(pattern: &str) -> String {
-    let calculate_char = |c: char| {
-        if c.is_alphanumeric() || c == '-' {
-            c
-        } else {
-            '_'
-        }
-    };
-
-    pattern.chars().map(calculate_char).collect()
+async fn fallback() -> impl IntoResponse {
+    AxumNope::ResourceNotFound
 }
 
 #[cfg(test)]
diff --git a/src/web/rustdoc.rs b/src/web/rustdoc.rs
index ba985d34e..1a5e72ae7 100644
--- a/src/web/rustdoc.rs
+++ b/src/web/rustdoc.rs
@@ -6,42 +6,36 @@ use crate::{
     storage::{rustdoc_archive_path, PathNotFoundError},
     utils::{self, spawn_blocking},
     web::{
-        axum_cached_redirect,
+        axum_cached_redirect, axum_parse_uri_with_params,
         cache::CachePolicy,
         crate_details::CrateDetails,
         csp::Csp,
-        error::{AxumNope, AxumResult, Nope},
+        error::{AxumNope, AxumResult},
         file::File,
-        match_version, match_version_axum,
+        headers::CanonicalUrl,
+        match_version_axum,
         metrics::RenderingTimesRecorder,
-        parse_url_with_params, redirect, redirect_base, MatchSemver, MetaData,
+        page::TemplateData,
+        MatchSemver, MetaData,
     },
     Config, Metrics, Storage, RUSTDOC_STATIC_STORAGE_PREFIX,
 };
 use anyhow::{anyhow, Context as _};
 use axum::{
     extract::{Extension, Path, Query},
-    http::StatusCode,
-    response::IntoResponse,
-};
-use iron::{
-    headers::{Link, LinkValue, RelationType},
-    modifiers::Redirect,
-    status,
-    url::percent_encoding::percent_decode,
-    Handler, IronResult, Request, Response, Url,
+    http::{StatusCode, Uri},
+    response::{Html, IntoResponse, Response as AxumResponse},
+    TypedHeader,
 };
 use lol_html::errors::RewritingError;
 use once_cell::sync::Lazy;
-use router::Router;
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{BTreeMap, HashMap},
     fmt::Write,
-    path,
     sync::Arc,
 };
-use tracing::{debug, instrument};
+use tracing::{debug, instrument, trace};
 
 static DOC_RUST_LANG_ORG_REDIRECTS: Lazy<HashMap<&str, &str>> = Lazy::new(|| {
     HashMap::from([
@@ -56,131 +50,119 @@ static DOC_RUST_LANG_ORG_REDIRECTS: Lazy<HashMap<&str, &str>> = Lazy::new(|| {
     ])
 });
 
-fn ico_handler(req: &mut Request) -> IronResult<Response> {
-    if let Some(&"favicon.ico") = req.url.path().last() {
-        // if we're looking for exactly "favicon.ico", we need to defer to the handler that
-        // actually serves it, so return a 404 here to make the main handler carry on
-        Err(Nope::ResourceNotFound.into())
-    } else {
-        // if we're looking for something like "favicon-20190317-1.35.0-nightly-c82834e2b.ico",
-        // redirect to the plain one so that the above branch can trigger with the correct filename
-        let url = ctry!(
-            req,
-            Url::parse(&format!("{}/favicon.ico", redirect_base(req))),
-        );
-
-        Ok(redirect(url))
-    }
+#[derive(Debug, Clone, Deserialize)]
+pub(crate) struct RustdocRedirectorParams {
+    name: String,
+    version: Option<String>,
+    target: Option<String>,
 }
 
 /// Handler called for `/:crate` and `/:crate/:version` URLs. Automatically redirects to the docs
 /// or crate details page based on whether the given crate version was successfully built.
-pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
+#[instrument(skip_all)]
+pub(crate) async fn rustdoc_redirector_handler(
+    Path(params): Path<RustdocRedirectorParams>,
+    Extension(metrics): Extension<Arc<Metrics>>,
+    Extension(storage): Extension<Arc<Storage>>,
+    Extension(config): Extension<Arc<Config>>,
+    Extension(pool): Extension<Pool>,
+    Query(query_pairs): Query<HashMap<String, String>>,
+    uri: Uri,
+) -> AxumResult<impl IntoResponse> {
+    #[instrument]
     fn redirect_to_doc(
-        req: &Request,
+        query_pairs: &HashMap<String, String>,
         url_str: String,
         cache_policy: CachePolicy,
         path_in_crate: Option<&str>,
-    ) -> IronResult<Response> {
-        let mut queries = BTreeMap::new();
+    ) -> AxumResult<impl IntoResponse> {
+        let mut queries: BTreeMap<String, String> = BTreeMap::new();
         if let Some(path) = path_in_crate {
             queries.insert("search".into(), path.into());
         }
-        queries.extend(req.url.as_ref().query_pairs());
-        let url = ctry!(req, parse_url_with_params(&url_str, queries));
-        let mut resp = Response::with((status::Found, Redirect(url)));
-        resp.extensions.insert::<CachePolicy>(cache_policy);
-        Ok(resp)
-    }
-
-    fn redirect_to_crate(req: &Request, name: &str, vers: &str) -> IronResult<Response> {
-        let url = ctry!(
-            req,
-            Url::parse(&format!("{}/crate/{}/{}", redirect_base(req), name, vers)),
-        );
-
-        let mut resp = Response::with((status::Found, Redirect(url)));
-        resp.extensions
-            .insert::<CachePolicy>(CachePolicy::ForeverInCdn);
-        Ok(resp)
+        queries.extend(query_pairs.to_owned());
+        trace!("redirect to doc");
+        Ok(axum_cached_redirect(
+            axum_parse_uri_with_params(&url_str, queries)?,
+            cache_policy,
+        )?)
     }
 
-    let metrics = extension!(req, Metrics).clone();
     let mut rendering_time = RenderingTimesRecorder::new(&metrics.rustdoc_redirect_rendering_times);
 
-    // this unwrap is safe because iron urls are always able to use `path_segments`
-    // i'm using this instead of `req.url.path()` to avoid allocating the Vec, and also to avoid
-    // keeping the borrow alive into the return statement
-    if req
-        .url
-        .as_ref()
-        .path_segments()
-        .unwrap()
-        .last()
-        .map_or(false, |s| s.ends_with(".js"))
-    {
-        // javascript files should be handled by the file server instead of erroneously
-        // redirecting to the crate root page
-        if req.url.as_ref().path_segments().unwrap().count() > 2 {
-            // this URL is actually from a crate-internal path, serve it there instead
-            rendering_time.step("serve JS for crate");
-            return rustdoc_html_server_handler(req);
-        } else {
-            rendering_time.step("serve JS");
-            let storage = extension!(req, Storage);
-            let config = extension!(req, Config);
-
-            let path = req.url.path();
-            let path = path.join("/");
-            return match File::from_path(storage, &path, config) {
-                Ok(f) => Ok(f.serve()),
-                Err(..) => Err(Nope::ResourceNotFound.into()),
+    // global static assets for older builds are served from the root, which ends up
+    // in this handler as `params.name`.
+    // Newer builds use a different static-root, and the static assets are served via
+    // `static_asset_handler`
+    if let Some((_, extension)) = params.name.rsplit_once('.') {
+        if ["css", "js", "png", "svg", "woff", "woff2"]
+            .binary_search(&extension)
+            .is_ok()
+        {
+            rendering_time.step("serve static asset");
+            // FIXME: this could be optimized: when a path doesn't exist
+            // in storage, we don't need to recheck on every request.
+            // Existing files are returned with caching headers, so
+            // are cached by the CDN.
+            // If cached, it doesn't need to be invalidated,
+            // since new nightly versions will always put their
+            // toolchain specific resources into the new folder,
+            // which is reached via the new handler.
+            return match spawn_blocking({
+                let storage = storage.clone();
+                let name = params.name.clone();
+                let config = config.clone();
+                move || File::from_path(&storage, &name, &config)
+            })
+            .await
+            {
+                Ok(file) => Ok(file.into_response()),
+                Err(err) => {
+                    if matches!(err.downcast_ref(), Some(AxumNope::ResourceNotFound))
+                        || matches!(err.downcast_ref(), Some(crate::storage::PathNotFoundError))
+                    {
+                        Err(AxumNope::ResourceNotFound)
+                    } else {
+                        Err(AxumNope::InternalError(err))
+                    }
+                }
             };
         }
-    } else if req
-        .url
-        .as_ref()
-        .path_segments()
-        .unwrap()
-        .last()
-        .map_or(false, |s| s.ends_with(".ico"))
-    {
-        // route .ico files into their dedicated handler so that docs.rs's favicon is always
-        // displayed
-        rendering_time.step("serve ICO");
-        return ico_handler(req);
     }
 
-    let router = extension!(req, Router);
-    let mut conn = extension!(req, Pool).get()?;
+    if let Some((_, extension)) = uri.path().rsplit_once('.') {
+        if extension == "ico" {
+            // redirect all ico requests
+            // originally from:
+            // https://github.com/rust-lang/docs.rs/commit/f3848a34c391841a2516a9e6ad1f80f6f490c6d0
+            return Ok(axum_cached_redirect(
+                "/-/static/favicon.ico",
+                CachePolicy::ForeverInCdnAndBrowser,
+            )?
+            .into_response());
+        }
+    }
 
-    // this handler should never called without crate pattern
-    let crate_name = cexpect!(req, router.find("crate"));
-    let crate_name = percent_decode(crate_name.as_bytes())
-        .decode_utf8()
-        .unwrap_or_else(|_| crate_name.into());
-    let (mut crate_name, path_in_crate) = match crate_name.split_once("::") {
+    let (mut crate_name, path_in_crate) = match params.name.split_once("::") {
         Some((krate, path)) => (krate.to_string(), Some(path.to_string())),
-        None => (crate_name.to_string(), None),
+        None => (params.name.to_string(), None),
     };
 
     if let Some(inner_path) = DOC_RUST_LANG_ORG_REDIRECTS.get(crate_name.as_str()) {
-        let url = format!("https://doc.rust-lang.org/{inner_path}/");
-        return redirect_to_doc(
-            req,
-            url,
+        return Ok(redirect_to_doc(
+            &query_pairs,
+            format!("https://doc.rust-lang.org/{inner_path}/"),
             CachePolicy::ForeverInCdnAndStaleInBrowser,
             path_in_crate.as_deref(),
-        );
+        )?
+        .into_response());
     }
 
-    let req_version = router.find("version");
-    let mut target = router.find("target");
-
     // it doesn't matter if the version that was given was exact or not, since we're redirecting
     // anyway
     rendering_time.step("match version");
-    let v = match_version(&mut conn, &crate_name, req_version)?;
+    let v = match_version_axum(&pool, &crate_name, params.version.as_deref()).await?;
+    trace!(?v, "matched version");
     if let Some(new_name) = v.corrected_name {
         // `match_version` checked against -/_ typos, so if we have a name here we should
         // use that instead
@@ -188,27 +170,74 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
     }
     let (mut version, id) = v.version.into_parts();
 
-    if let None | Some("latest") = req_version {
+    // we might get requests to crate-specific JS files here.
+    if let Some(ref target) = params.target {
+        if target.ends_with(".js") {
+            // this URL is actually from a crate-internal path, serve it there instead
+            rendering_time.step("serve JS for crate");
+            let krate = spawn_blocking({
+                let crate_name = crate_name.clone();
+                let version = version.clone();
+                move || {
+                    let mut conn = pool.get()?;
+                    CrateDetails::new(&mut *conn, &crate_name, &version, &version, None)
+                }
+            })
+            .await?
+            .ok_or(AxumNope::ResourceNotFound)?;
+
+            match spawn_blocking({
+                let version = version.clone();
+                let storage = storage.clone();
+                let target = target.clone();
+                move || {
+                    storage.fetch_rustdoc_file(
+                        &crate_name,
+                        &version,
+                        &target,
+                        krate.archive_storage,
+                        None, // FIXME: &mut rendering_time, re-add this when storage is async
+                    )
+                }
+            })
+            .await
+            {
+                Ok(blob) => return Ok(File(blob).into_response()),
+                Err(err) => {
+                    if !matches!(err.downcast_ref(), Some(AxumNope::ResourceNotFound))
+                        && !matches!(err.downcast_ref(), Some(crate::storage::PathNotFoundError))
+                    {
+                        debug!(?target, ?err, "got error serving file");
+                    }
+                    return Err(AxumNope::ResourceNotFound);
+                }
+            }
+        }
+    }
+
+    if let None | Some("latest") = params.version.as_deref() {
         version = "latest".to_string()
     }
 
     // get target name and whether it has docs
     // FIXME: This is a bit inefficient but allowing us to use less code in general
     rendering_time.step("fetch release doc status");
-    let (target_name, has_docs): (String, bool) = {
-        let rows = ctry!(
-            req,
-            conn.query(
+    let (target_name, has_docs): (String, bool) = spawn_blocking({
+        move || {
+            let mut conn = pool.get()?;
+            let row = conn.query_one(
                 "SELECT target_name, rustdoc_status
                  FROM releases
                  WHERE releases.id = $1",
-                &[&id]
-            ),
-        );
+                &[&id],
+            )?;
 
-        (rows[0].get(0), rows[0].get(1))
-    };
+            Ok((row.get(0), row.get(1)))
+        }
+    })
+    .await?;
 
+    let mut target = params.target.as_deref();
     if target == Some("index.html") || target == Some(&target_name) {
         target = None;
     }
@@ -216,11 +245,10 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
     if has_docs {
         rendering_time.step("redirect to doc");
 
-        let base = redirect_base(req);
         let url_str = if let Some(target) = target {
-            format!("{base}/{crate_name}/{version}/{target}/{target_name}/")
+            format!("/{crate_name}/{version}/{target}/{target_name}/")
         } else {
-            format!("{base}/{crate_name}/{version}/{target_name}/")
+            format!("/{crate_name}/{version}/{target_name}/")
         };
 
         let cache = if version == "latest" {
@@ -229,10 +257,17 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
             CachePolicy::ForeverInCdnAndStaleInBrowser
         };
 
-        redirect_to_doc(req, url_str, cache, path_in_crate.as_deref())
+        Ok(
+            redirect_to_doc(&query_pairs, url_str, cache, path_in_crate.as_deref())?
+                .into_response(),
+        )
     } else {
         rendering_time.step("redirect to crate");
-        redirect_to_crate(req, &crate_name, &version)
+        Ok(axum_cached_redirect(
+            format!("/crate/{}/{}", crate_name, version),
+            CachePolicy::ForeverInCdn,
+        )?
+        .into_response())
     }
 }
 
@@ -259,110 +294,114 @@ impl RustdocPage {
         self,
         rustdoc_html: &[u8],
         max_parse_memory: usize,
-        req: &mut Request,
+        templates: &TemplateData,
+        metrics: &Metrics,
+        config: &Config,
         file_path: &str,
-    ) -> IronResult<Response> {
-        use iron::{headers::ContentType, status::Status};
-
-        let templates = req
-            .extensions
-            .get::<super::TemplateData>()
-            .expect("missing TemplateData from the request extensions");
-
-        let metrics = req
-            .extensions
-            .get::<crate::Metrics>()
-            .expect("missing Metrics from the request extensions");
-
+    ) -> AxumResult<AxumResponse> {
         let is_latest_url = self.is_latest_url;
         let canonical_url = self.canonical_url.clone();
 
         // Build the page of documentation
-        let ctx = ctry!(req, tera::Context::from_serialize(self));
-        let config = extension!(req, Config);
+        let ctx = tera::Context::from_serialize(self).context("error creating tera context")?;
+
         // Extract the head and body of the rustdoc file so that we can insert it into our own html
         // while logging OOM errors from html rewriting
         let html = match utils::rewrite_lol(rustdoc_html, max_parse_memory, ctx, templates) {
             Err(RewritingError::MemoryLimitExceeded(..)) => {
                 metrics.html_rewrite_ooms.inc();
 
-                let err = anyhow!(
-                    "Failed to serve the rustdoc file '{}' because rewriting it surpassed the memory limit of {} bytes",
-                    file_path, config.max_parse_memory,
-                );
-
-                ctry!(req, Err(err))
+                return Err(AxumNope::InternalError(
+                    anyhow!(
+                        "Failed to serve the rustdoc file '{}' because rewriting it surpassed the memory limit of {} bytes",
+                        file_path, config.max_parse_memory,
+                    )
+                ));
             }
-            result => ctry!(req, result),
+            result => result.context("error rewriting HTML")?,
         };
 
-        let mut response = Response::with((Status::Ok, html));
-        response.headers.set(ContentType::html());
-        let link_value = LinkValue::new(canonical_url)
-            .push_rel(RelationType::ExtRelType("canonical".to_string()));
-
-        response.headers.set(Link::new(vec![link_value]));
-
-        response.extensions.insert::<CachePolicy>(if is_latest_url {
-            CachePolicy::ForeverInCdn
-        } else {
-            CachePolicy::ForeverInCdnAndStaleInBrowser
-        });
-        Ok(response)
+        Ok((
+            StatusCode::OK,
+            TypedHeader(CanonicalUrl(
+                canonical_url
+                    .parse()
+                    .context("could not parse canonical url")?,
+            )),
+            Extension(if is_latest_url {
+                CachePolicy::ForeverInCdn
+            } else {
+                CachePolicy::ForeverInCdnAndStaleInBrowser
+            }),
+            Html(html),
+        )
+            .into_response())
     }
 }
 
+#[derive(Clone, Deserialize)]
+pub(crate) struct RustdocHtmlParams {
+    name: String,
+    version: String,
+    // both target and path are only used for matching the route.
+    // The actual path is read from the request `Uri` because
+    // we have some static filenames directly in the routes.
+    #[allow(dead_code)]
+    target: Option<String>,
+    #[allow(dead_code)]
+    path: Option<String>,
+}
+
 /// Serves documentation generated by rustdoc.
 ///
 /// This includes all HTML files for an individual crate, as well as the `search-index.js`, which is
 /// also crate-specific.
-pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
-    let metrics = extension!(req, Metrics).clone();
+#[allow(clippy::too_many_arguments)]
+#[instrument(skip_all)]
+pub(crate) async fn rustdoc_html_server_handler(
+    Path(params): Path<RustdocHtmlParams>,
+    Extension(metrics): Extension<Arc<Metrics>>,
+    Extension(templates): Extension<Arc<TemplateData>>,
+    Extension(pool): Extension<Pool>,
+    Extension(storage): Extension<Arc<Storage>>,
+    Extension(config): Extension<Arc<Config>>,
+    Extension(csp): Extension<Arc<Csp>>,
+    Extension(updater): Extension<Arc<RepositoryStatsUpdater>>,
+    uri: Uri,
+) -> AxumResult<AxumResponse> {
     let mut rendering_time = RenderingTimesRecorder::new(&metrics.rustdoc_rendering_times);
 
-    // Pages generated by Rustdoc are not ready to be served with a CSP yet.
-    req.extensions
-        .get_mut::<Csp>()
-        .expect("missing CSP")
-        .suppress(true);
-
-    // Get the request parameters
-    let router = extension!(req, Router);
-
-    // Get the crate name and version from the request
-    let (name, url_version) = (
-        router.find("crate").unwrap_or("").to_string(),
-        router.find("version"),
-    );
+    // since we directly use the Uri-path and not the extracted params from the router,
+    // we have to percent-decode the string here.
+    let original_path = percent_encoding::percent_decode(uri.path().as_bytes())
+        .decode_utf8()
+        .map_err(|_| AxumNope::BadRequest)?;
 
-    let pool = extension!(req, Pool);
-    let mut conn = pool.get()?;
-    let config = extension!(req, Config);
-    let storage = extension!(req, Storage);
-    let mut req_path = req.url.path();
-
-    // Remove the name and version from the path
-    req_path.drain(..2).for_each(drop);
-
-    // Convenience closure to allow for easy redirection
-    let redirect = |name: &str,
-                    vers: &str,
-                    path: &[&str],
-                    cache_policy: CachePolicy|
-     -> IronResult<Response> {
-        // Format and parse the redirect url
-        let redirect_path = format!(
-            "{}/{}/{}/{}",
-            redirect_base(req),
-            name,
-            vers,
-            path.join("/")
-        );
-        let url = ctry!(req, Url::parse(&redirect_path));
+    let mut req_path: Vec<&str> = original_path.split('/').collect();
+    // Remove the empty start, the name and the version from the path
+    req_path.drain(..3).for_each(drop);
 
-        Ok(super::cached_redirect(url, cache_policy))
-    };
+    // Pages generated by Rustdoc are not ready to be served with a CSP yet.
+    csp.suppress(true);
+
+    // Convenience function to allow for easy redirection
+    #[instrument]
+    fn redirect(
+        name: &str,
+        vers: &str,
+        path: &[&str],
+        cache_policy: CachePolicy,
+    ) -> AxumResult<AxumResponse> {
+        trace!("redirect");
+        // Format and parse the redirect url
+        Ok(axum_cached_redirect(
+            format!("/{}/{}/{}", name, vers, path.join("/")),
+            cache_policy,
+        )?
+        .into_response())
+    }
 
+    trace!("match version");
     rendering_time.step("match version");
 
     // Check the database for releases with the requested version while doing the following:
@@ -371,7 +410,8 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
     // * If both the name and the version are an exact match, return the version of the crate.
     // * If there is an exact match, but the requested crate name was corrected (dashes vs. underscores), redirect to the corrected name.
     // * If there is a semver (but not exact) match, redirect to the exact version.
-    let release_found = match_version(&mut conn, &name, url_version)?;
+    let release_found = match_version_axum(&pool, &params.name, Some(&params.version)).await?;
+    trace!(?release_found, "found release");
 
     let (version, version_or_latest, is_latest_url) = match release_found.version {
         MatchSemver::Exact((version, _)) => {
@@ -397,35 +437,38 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
             // to prevent cloudfront caching the wrong artifacts on URLs with loose semver
             // versions, redirect the browser to the returned version instead of loading it
             // immediately
-            return redirect(&name, &v, &req_path, CachePolicy::ForeverInCdn);
+            return redirect(&params.name, &v, &req_path, CachePolicy::ForeverInCdn);
         }
     };
 
-    let updater = extension!(req, RepositoryStatsUpdater);
-
+    trace!("crate details");
     rendering_time.step("crate details");
 
     // Get the crate's details from the database
     // NOTE: we know this crate must exist because we just checked it above (or else `match_version` is buggy)
-    let krate = cexpect!(
-        req,
-        ctry!(
-            req,
+    let krate = spawn_blocking({
+        let params = params.clone();
+        let version = version.clone();
+        let version_or_latest = version_or_latest.clone();
+        move || {
+            let mut conn = pool.get()?;
             CrateDetails::new(
                 &mut *conn,
-                &name,
+                &params.name,
                 &version,
                 &version_or_latest,
-                Some(updater)
+                Some(&updater),
             )
-        )
-    );
+        }
+    })
+    .await?
+    .ok_or(AxumNope::ResourceNotFound)?;
 
     // if visiting the full path to the default target, remove the target from the path
     // expects a req_path that looks like `[/:target]/.*`
     if req_path.first().copied() == Some(&krate.metadata.default_target) {
         return redirect(
-            &name,
+            &params.name,
             &version_or_latest,
             &req_path[1..],
             CachePolicy::ForeverInCdn,
@@ -433,39 +476,61 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
     }
 
     // Create the path to access the file from
-    let mut path = req_path.join("/");
-    if path.ends_with('/') {
+    let mut storage_path = req_path.join("/");
+    if storage_path.ends_with('/') {
         req_path.pop(); // get rid of empty string
-        path.push_str("index.html");
+        storage_path.push_str("index.html");
         req_path.push("index.html");
     }
-    let mut path = ctry!(req, percent_decode(path.as_bytes()).decode_utf8());
+
+    trace!(?storage_path, ?req_path, "try fetching from storage");
 
     // Attempt to load the file from the database
-    let blob = match storage.fetch_rustdoc_file(
-        &name,
-        &version,
-        &path,
-        krate.archive_storage,
-        &mut rendering_time,
-    ) {
+    let blob = match spawn_blocking({
+        let params = params.clone();
+        let version = version.clone();
+        let storage = storage.clone();
+        let storage_path = storage_path.clone();
+        move || {
+            storage.fetch_rustdoc_file(
+                &params.name,
+                &version,
+                &storage_path,
+                krate.archive_storage,
+                None, // FIXME: &mut rendering_time, re-add this when storage is async
+            )
+        }
+    })
+    .await
+    {
         Ok(file) => file,
         Err(err) => {
-            if !matches!(err.downcast_ref(), Some(Nope::ResourceNotFound))
+            if !matches!(err.downcast_ref(), Some(AxumNope::ResourceNotFound))
                 && !matches!(err.downcast_ref(), Some(crate::storage::PathNotFoundError))
             {
-                debug!("got error serving {}: {}", path, err);
+                debug!("got error serving {}: {}", storage_path, err);
             }
             // If it fails, we try again with /index.html at the end
-            path.to_mut().push_str("/index.html");
+            storage_path.push_str("/index.html");
             req_path.push("index.html");
 
-            return if ctry!(
-                req,
-                storage.rustdoc_file_exists(&name, &version, &path, krate.archive_storage)
-            ) {
+            return if spawn_blocking({
+                let params = params.clone();
+                let version = version.clone();
+                let storage = storage.clone();
+                move || {
+                    storage.rustdoc_file_exists(
+                        &params.name,
+                        &version,
+                        &storage_path,
+                        krate.archive_storage,
+                    )
+                }
+            })
+            .await?
+            {
                 redirect(
-                    &name,
+                    &params.name,
                     &version_or_latest,
                     &req_path,
                     CachePolicy::ForeverInCdn,
@@ -474,25 +539,26 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
                 // This is a target, not a module; it may not have been built.
                 // Redirect to the default target and show a search page instead of a hard 404.
                 redirect(
-                    &format!("/crate/{}", name),
+                    &format!("/crate/{}", params.name),
                     &format!("{}/target-redirect", version),
                     &req_path,
                     CachePolicy::ForeverInCdn,
                 )
             } else {
-                Err(Nope::ResourceNotFound.into())
+                Err(AxumNope::ResourceNotFound)
             };
         }
     };
 
     // Serve non-html files directly
-    if !path.ends_with(".html") {
+    if !storage_path.ends_with(".html") {
+        trace!(?storage_path, "serve asset");
         rendering_time.step("serve asset");
 
         // default asset caching behaviour is `Cache::ForeverInCdnAndBrowser`.
         // This is an edge-case when we serve invocation specific static assets under `/latest/`:
         // https://github.com/rust-lang/docs.rs/issues/1593
-        return Ok(File(blob).serve());
+        return Ok(File(blob).into_response());
     }
 
     rendering_time.step("find latest path");
@@ -506,14 +572,8 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
         .with_context(|| {
             format!(
                 "invalid semver in database for crate {}: {}",
-                name, &version
+                params.name, &version
             )
-        })
-        // should be impossible unless there is a semver incompatible version in the db
-        // Note that there is a redirect earlier for semver matches to the exact version
-        .map_err(|err| {
-            utils::report_error(&err);
-            Nope::InternalServerError
         })?
         .pre
         .is_empty());
@@ -549,7 +609,7 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
         "".to_string()
     };
 
-    let query_string = if let Some(query) = req.url.query() {
+    let query_string = if let Some(query) = uri.query() {
         format!("?{}", query)
     } else {
         "".to_string()
@@ -557,10 +617,13 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
 
     let permalink_path = format!(
         "/{}/{}/{}{}",
-        name, latest_version, inner_path, query_string
+        params.name, latest_version, inner_path, query_string
     );
 
-    let latest_path = format!("/crate/{}/latest{}{}", name, target_redirect, query_string);
+    let latest_path = format!(
+        "/crate/{}/latest{}{}",
+        params.name, target_redirect, query_string
+    );
 
     // Set the canonical URL for search engines to the `/latest/` page on docs.rs.
     // Note: The URL this points to may not exist. For instance, if we're rendering
@@ -570,7 +633,7 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
     // Don't include index.html in the canonical URL.
     let canonical_url = format!(
         "https://docs.rs/{}/latest/{}",
-        name,
+        params.name,
         inner_path.replace("index.html", "")
     );
 
@@ -585,20 +648,36 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
     };
 
     rendering_time.step("rewrite html");
-    RustdocPage {
-        latest_path,
-        canonical_url,
-        permalink_path,
-        latest_version,
-        target,
-        inner_path,
-        is_latest_version,
-        is_latest_url,
-        is_prerelease,
-        metadata: krate.metadata.clone(),
-        krate,
-    }
-    .into_response(&blob.content, config.max_parse_memory, req, &path)
+
+    // Build the page of documentation,
+    // inside `spawn_blocking` since it's CPU intensive.
+    spawn_blocking({
+        let metrics = metrics.clone();
+        move || {
+            Ok(RustdocPage {
+                latest_path,
+                canonical_url,
+                permalink_path,
+                latest_version,
+                target,
+                inner_path,
+                is_latest_version,
+                is_latest_url,
+                is_prerelease,
+                metadata: krate.metadata.clone(),
+                krate: krate.clone(),
+            }
+            .into_response(
+                &blob.content,
+                config.max_parse_memory,
+                &templates,
+                &metrics,
+                &config,
+                &storage_path,
+            ))
+        }
+    })
+    .await?
 }
 
 /// Checks whether the given path exists.
@@ -735,7 +814,7 @@ pub(crate) async fn target_redirect_handler(
     };
 
     Ok(axum_cached_redirect(
-        &format!("/{name}/{version_or_latest}/{redirect_path}"),
+        format!("/{name}/{version_or_latest}/{redirect_path}"),
         if is_latest_url {
             CachePolicy::ForeverInCdn
         } else {
@@ -775,14 +854,10 @@ pub(crate) async fn download_handler(
     Extension(storage): Extension<Arc<Storage>>,
     Extension(config): Extension<Arc<Config>>,
 ) -> AxumResult<impl IntoResponse> {
-    let version = match match_version_axum(&pool, &name, Some(&req_version))
+    let (version, _) = match_version_axum(&pool, &name, Some(&req_version))
         .await?
         .assume_exact()?
-    {
-        MatchSemver::Exact((version, _))
-        | MatchSemver::Latest((version, _))
-        | MatchSemver::Semver((version, _)) => version,
-    };
+        .into_parts();
 
     let archive_path = rustdoc_archive_path(&name, &version);
 
@@ -814,7 +889,7 @@ pub(crate) async fn download_handler(
     .await?;
 
     Ok(super::axum_cached_redirect(
-        &format!("{}/{}", config.s3_static_root_path, archive_path),
+        format!("{}/{}", config.s3_static_root_path, archive_path),
         CachePolicy::ForeverInCdn,
     )?)
 }
@@ -841,39 +916,6 @@ pub(crate) async fn static_asset_handler(
     .await?)
 }
 
-/// Serves shared web resources used by rustdoc-generated documentation.
-///
-/// This includes common `css` and `js` files that only change when the compiler is updated, but are
-/// otherwise the same for all crates documented with that compiler. Those have a custom handler to
-/// deduplicate them and save space.
-///
-/// This handler considers only the last component of the request path, and looks for a matching file
-/// in the Storage root.
-pub struct LegacySharedResourceHandler;
-
-impl Handler for LegacySharedResourceHandler {
-    fn handle(&self, req: &mut Request) -> IronResult<Response> {
-        let path = req.url.path();
-        let filename = path.last().unwrap(); // unwrap is fine: vector is non-empty
-        if let Some(extension) = path::Path::new(filename).extension() {
-            if ["js", "css", "woff", "woff2", "svg", "png"]
-                .iter()
-                .any(|s| *s == extension)
-            {
-                let storage = extension!(req, Storage);
-                let config = extension!(req, Config);
-
-                if let Ok(file) = File::from_path(storage, filename, config) {
-                    return Ok(file.serve());
-                }
-            }
-        }
-
-        // Just always return a 404 here - the main handler will then try the other handlers
-        Err(Nope::ResourceNotFound.into())
-    }
-}
-
 #[cfg(test)]
 mod test {
     use crate::{test::*, web::cache::CachePolicy, Config};
diff --git a/src/web/strangler.rs b/src/web/strangler.rs
deleted file mode 100644
index 8a3abc11b..000000000
--- a/src/web/strangler.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-/// This implements a simplified strangler-service,
-/// using code from
-/// https://github.com/MidasLamb/axum-strangler/
-///
-/// because
-/// * axum-strangler breaks redirects in our current implementation:
-///   https://github.com/MidasLamb/axum-strangler/issues/4
-/// * it adds quite some dependencies it only needs for supporting WebSockets (which we don't
-///   need).
-/// * it has more dependencies itself doesn't need (reqwest)
-///
-/// We might be able to switch back to using the library when
-/// * the host/redirect problem is fixed
-/// * websocket suport is hidden behind a feature
-use std::{
-    convert::Infallible,
-    future::Future,
-    pin::Pin,
-    sync::Arc,
-    task::{Context, Poll},
-};
-
-use axum::http::{uri::Authority, Uri};
-use tower_service::Service;
-
-/// Service that forwards all requests to another service
-/// ```ignore
-/// #[tokio::main]
-/// async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-///     let strangler_svc = StranglerService::new(
-///         axum::http::uri::Authority::from_static("127.0.0.1:3333"),
-///     );
-///     let router = axum::Router::new().fallback_service(strangler_svc);
-///     axum::Server::bind(&"127.0.0.1:0".parse()?)
-///         .serve(router.into_make_service())
-///         # .with_graceful_shutdown(async {
-///         # // Shut down immediately
-///         # })
-///         .await?;
-///     Ok(())
-/// }
-/// ```
-#[derive(Clone)]
-pub struct StranglerService {
-    http_client: hyper::Client<hyper::client::HttpConnector>,
-    inner: Arc<InnerStranglerService>,
-}
-
-impl StranglerService {
-    /// Construct a new `StranglerService`.
-    /// The `strangled_authority` is the host & port of the service to be strangled.
-    pub fn new(strangled_authority: Authority) -> Self {
-        Self {
-            http_client: hyper::Client::new(),
-            inner: Arc::new(InnerStranglerService {
-                strangled_authority,
-            }),
-        }
-    }
-}
-
-struct InnerStranglerService {
-    strangled_authority: axum::http::uri::Authority,
-}
-
-impl Service<axum::http::Request<axum::body::Body>> for StranglerService {
-    type Response = axum::response::Response;
-    type Error = Infallible;
-    type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
-
-    fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
-    }
-
-    fn call(&mut self, req: axum::http::Request<axum::body::Body>) -> Self::Future {
-        let http_client = self.http_client.clone();
-        let inner = self.inner.clone();
-
-        let fut = forward_call_to_strangled(http_client, inner, req);
-        Box::pin(fut)
-    }
-}
-
-#[tracing::instrument(skip_all, fields(req.path = %req.uri()))] // Note that we set the path to the
-                                                                // "full" uri, as host etc gets
-                                                                // removed by axum already.
-async fn forward_call_to_strangled(
-    http_client: hyper::Client<hyper::client::HttpConnector>,
-    inner: Arc<InnerStranglerService>,
-    mut req: axum::http::Request<axum::body::Body>,
-) -> Result<axum::response::Response, Infallible> {
-    tracing::debug!("handling a request");
-    let uri: Uri = {
-        // Not really anything to do, because this could just not be a websocket
-        // request.
-        let strangled_authority = inner.strangled_authority.clone();
-        let strangled_scheme = axum::http::uri::Scheme::HTTP;
-        Uri::builder()
-            .authority(strangled_authority)
-            .scheme(strangled_scheme)
-            .path_and_query(req.uri().path_and_query().cloned().unwrap())
-            .build()
-            .unwrap()
-    };
-
-    *req.uri_mut() = uri;
-
-    let r = http_client.request(req).await.unwrap();
-
-    let mut response_builder = axum::response::Response::builder();
-    response_builder = response_builder.status(r.status());
-
-    if let Some(headers) = response_builder.headers_mut() {
-        *headers = r.headers().clone();
-    }
-
-    let response = response_builder
-        .body(axum::body::boxed(r))
-        .map_err(|_| axum::http::StatusCode::INTERNAL_SERVER_ERROR);
-
-    match response {
-        Ok(response) => Ok(response),
-        Err(_) => todo!(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Arc;
-
-    use super::*;
-    use axum::{http::uri::Authority, routing::get, Extension, Router};
-
-    /// Create a mock service that's not connecting to anything.
-    fn make_svc() -> StranglerService {
-        StranglerService::new(Authority::from_static("127.0.0.1:0"))
-    }
-
-    #[tokio::test]
-    async fn can_be_used_as_fallback() {
-        let router = Router::new().fallback_service(make_svc());
-        axum::Server::bind(&"0.0.0.0:0".parse().unwrap()).serve(router.into_make_service());
-    }
-
-    #[tokio::test]
-    async fn can_be_used_for_a_route() {
-        let router = Router::new().route_service("/api", make_svc());
-        axum::Server::bind(&"0.0.0.0:0".parse().unwrap()).serve(router.into_make_service());
-    }
-
-    #[derive(Clone)]
-    struct StopChannel(Arc<tokio::sync::broadcast::Sender<()>>);
-
-    struct StartupHelper {
-        strangler_port: u16,
-        strangler_joinhandle: tokio::task::JoinHandle<()>,
-        stranglee_joinhandle: tokio::task::JoinHandle<()>,
-    }
-
-    async fn start_up_strangler_and_strangled(strangled_router: Router) -> StartupHelper {
-        let (tx, mut rx_1) = tokio::sync::broadcast::channel::<()>(1);
-        let mut rx_2 = tx.subscribe();
-        let tx_arc = Arc::new(tx);
-        let stop_channel = StopChannel(tx_arc);
-
-        let stranglee_tcp = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
-        let stranglee_port = stranglee_tcp.local_addr().unwrap().port();
-
-        let strangler_tcp = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
-        let strangler_port = strangler_tcp.local_addr().unwrap().port();
-
-        let client = hyper::Client::new();
-        let strangler_svc = StranglerService {
-            http_client: client,
-            inner: Arc::new(InnerStranglerService {
-                strangled_authority: axum::http::uri::Authority::try_from(format!(
-                    "127.0.0.1:{}",
-                    stranglee_port
-                ))
-                .unwrap(),
-            }),
-        };
-
-        let background_stranglee_handle = tokio::spawn(async move {
-            axum::Server::from_tcp(stranglee_tcp)
-                .unwrap()
-                .serve(
-                    strangled_router
-                        .layer(axum::Extension(stop_channel))
-                        .into_make_service(),
-                )
-                .with_graceful_shutdown(async {
-                    rx_1.recv().await.ok();
-                })
-                .await
-                .unwrap();
-        });
-
-        let background_strangler_handle = tokio::spawn(async move {
-            let router = Router::new().fallback_service(strangler_svc);
-            axum::Server::from_tcp(strangler_tcp)
-                .unwrap()
-                .serve(router.into_make_service())
-                .with_graceful_shutdown(async {
-                    rx_2.recv().await.ok();
-                })
-                .await
-                .unwrap();
-        });
-
-        StartupHelper {
-            strangler_port,
-            strangler_joinhandle: background_strangler_handle,
-            stranglee_joinhandle: background_stranglee_handle,
-        }
-    }
-
-    #[tokio::test]
-    async fn proxies_strangled_http_service() {
-        let router = Router::new().route(
-            "/api/something",
-            get(
-                |Extension(StopChannel(tx_arc)): Extension<StopChannel>| async move {
-                    tx_arc.send(()).unwrap();
-                    "I'm being strangled"
-                },
-            ),
-        );
-
-        let StartupHelper {
-            strangler_port,
-            strangler_joinhandle,
-            stranglee_joinhandle,
-        } = start_up_strangler_and_strangled(router).await;
-
-        let c = reqwest::Client::new();
-        let r = c
-            .get(format!("http://127.0.0.1:{}/api/something", strangler_port))
-            .send()
-            .await
-            .unwrap()
-            .text()
-            .await
-            .unwrap();
-
-        assert_eq!(r, "I'm being strangled");
-
-        stranglee_joinhandle.await.unwrap();
-        strangler_joinhandle.await.unwrap();
-    }
-}