cleanup #1848

Job	Run time
byo-crypto	1m 50s
clang-sanitizers (,thread)	2m 50s
downstream	2m 1s
clang-sanitizers (,address,undefined)	2m 40s
linux-compat (manylinux1-x64)	1m 40s
linux-compat (manylinux1-x86)	1m 47s
linux-compiler-compat (clang-3)	2m 5s
linux-shared-libs	1m 48s
linux-compat (manylinux2014-x64)	1m 47s
localhost-test-linux	1m 54s
linux-compat (manylinux2014-x86)	1m 50s
linux-compat (al2-x64)	1m 38s
linux-compiler-compat (clang-6)	2m 4s
localhost-test-mac	1s
linux-compat (fedora-34-x64)	1m 53s
localhost-test-win	3m 19s
linux-compiler-compat (clang-8)	2m 4s
linux-compat (opensuse-leap)	1m 54s
linux-compiler-compat (clang-9)	2m 5s
linux-compat (rhel8-x64)	1m 52s
linux-compiler-compat (clang-10)	2m 6s
osx	1m 35s
windows	3m 19s
linux-compiler-compat (clang-11)	2m 6s
linux-compiler-compat (gcc-4.8)	2m 4s
windows-app-verifier	3m 9s
windows-shared-libs	3m 3s
linux-compiler-compat (gcc-5)	2m 5s
windows-vc14 (x86)	2m 4s
windows-vc14 (x64)	2m 8s
linux-compiler-compat (gcc-6)	2m 4s
linux-compiler-compat (gcc-7)	1m 48s
linux-compiler-compat (gcc-8)	2m 3s
	1h 8m 36s

Provide feedback