From 1d6d0ea03d50d24a67c45cec95dd05f92cbd49e7 Mon Sep 17 00:00:00 2001
From: Joshua Yanovski <pythonesque@gmail.com>
Date: Mon, 20 Jan 2020 17:16:41 +0100
Subject: [PATCH] Fix all warnings.

---
 Cargo.lock                      | 586 --------------------------------
 Cargo.toml                      |   3 +-
 voxygen/src/scene/mod.rs        |   4 +-
 world/src/block/mod.rs          |   2 -
 world/src/generator/town/mod.rs |   2 +-
 world/src/sim/diffusion.rs      |  12 +-
 world/src/sim/erosion.rs        | 181 +++++-----
 world/src/sim/map.rs            |   3 +-
 world/src/sim/mod.rs            | 251 +++++++-------
 world/src/sim/util.rs           |   2 +-
 world/src/util/structure.rs     |   1 -
 11 files changed, 226 insertions(+), 821 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3ca7450cc9..3fa4784cc2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -108,14 +108,6 @@ name = "ascii"
 version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "ash"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "atk-sys"
 version = "0.6.0"
@@ -237,15 +229,6 @@ name = "block"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "block-buffer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "brotli-sys"
 version = "0.3.2"
@@ -284,16 +267,6 @@ dependencies = [
  "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "bumpalo"
-version = "3.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "byte-tools"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "byteorder"
 version = "0.5.3"
@@ -339,16 +312,6 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "calloop"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "cast"
 version = "0.2.3"
@@ -449,14 +412,6 @@ dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "cmake"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "cocoa"
 version = "0.18.5"
@@ -500,11 +455,6 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "colorful"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "conrod_core"
 version = "0.63.0"
@@ -558,11 +508,6 @@ name = "constant_time_eq"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "copyless"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "copypasta"
 version = "0.6.0"
@@ -602,18 +547,6 @@ dependencies = [
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "core-video-sys"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "coreaudio-rs"
 version = "0.9.1"
@@ -799,16 +732,6 @@ dependencies = [
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "d3d12"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "daggy"
 version = "0.5.0"
@@ -837,14 +760,6 @@ dependencies = [
  "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "digest"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "directories"
 version = "2.0.2"
@@ -976,11 +891,6 @@ dependencies = [
  "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "faster"
 version = "0.5.0"
@@ -1075,14 +985,6 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "gdk"
 version = "0.8.0"
@@ -1144,14 +1046,6 @@ dependencies = [
  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.1.13"
@@ -1172,116 +1066,6 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "gfx-auxil"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-hal 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "spirv_cross 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gfx-backend-dx11"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-auxil 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-hal 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "range-alloc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "spirv_cross 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "wio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gfx-backend-dx12"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "d3d12 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-auxil 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-hal 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "range-alloc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "spirv_cross 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gfx-backend-empty"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "gfx-hal 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gfx-backend-metal"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-auxil 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-hal 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "metal 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "range-alloc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "spirv_cross 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "storage-map 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gfx-backend-vulkan"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ash 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-hal 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11 2.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gfx-hal"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "gfx_core"
 version = "0.9.2"
@@ -1419,16 +1203,6 @@ dependencies = [
  "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "glsl-to-spirv"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "glutin"
 version = "0.21.1"
@@ -1706,14 +1480,6 @@ dependencies = [
  "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "js-sys"
-version = "0.3.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1864,20 +1630,6 @@ dependencies = [
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "metal"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "mime"
 version = "0.2.6"
@@ -2178,7 +1930,6 @@ version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc_exception 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2191,14 +1942,6 @@ dependencies = [
  "objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "objc_id"
 version = "0.1.1"
@@ -2300,15 +2043,6 @@ dependencies = [
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "parking_lot_core"
 version = "0.2.14"
@@ -2334,19 +2068,6 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "parking_lot_core"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@@ -2734,11 +2455,6 @@ dependencies = [
  "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "range-alloc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "raw-window-handle"
 version = "0.3.1"
@@ -2817,15 +2533,6 @@ name = "regex-syntax"
 version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "relevant"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "remove_dir_all"
 version = "0.5.2"
@@ -2834,31 +2541,6 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rendy-descriptor"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "gfx-hal 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "relevant 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rendy-memory"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "colorful 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-hal 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "hibitset 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "relevant 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rodio"
 version = "0.9.0"
@@ -3070,17 +2752,6 @@ name = "sha1"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "sha2"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "shared_library"
 version = "0.1.9"
@@ -3226,16 +2897,6 @@ name = "spin"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "spirv_cross"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.1.1"
@@ -3259,14 +2920,6 @@ name = "stdweb"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "storage-map"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "sum_type"
 version = "0.2.0"
@@ -3307,17 +2960,6 @@ dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "synstructure"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "synstructure"
 version = "0.12.3"
@@ -3338,19 +2980,6 @@ dependencies = [
  "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tempfile"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "term"
 version = "0.5.2"
@@ -3464,11 +3093,6 @@ dependencies = [
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "typenum"
-version = "1.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "unicase"
 version = "1.4.2"
@@ -3528,11 +3152,6 @@ dependencies = [
  "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "vec_map"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "vek"
 version = "0.9.11"
@@ -3698,7 +3317,6 @@ dependencies = [
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "faster 0.5.0 (git+https://github.com/AdamNiederer/faster.git?rev=6f99e0396e9992222bb33e8fd1e84347b410d9c0)",
- "glsl-to-spirv 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3718,9 +3336,6 @@ dependencies = [
  "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "veloren-common 0.4.0",
- "wgpu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winit 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "zerocopy 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3748,55 +3363,6 @@ name = "wasi"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro-support 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "wayland-client"
 version = "0.21.13"
@@ -3817,10 +3383,8 @@ version = "0.23.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "calloop 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "downcast-rs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-commons 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3906,42 +3470,6 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "wgpu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "wgpu-native 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "zerocopy 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "wgpu-native"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-backend-dx11 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-backend-dx12 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-backend-empty 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-backend-metal 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-backend-vulkan 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx-hal 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rendy-descriptor 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rendy-memory 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "winapi"
 version = "0.2.8"
@@ -4013,34 +3541,6 @@ dependencies = [
  "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "winit"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-video-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "dispatch 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "instant 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smithay-client-toolkit 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "winres"
 version = "0.1.11"
@@ -4049,14 +3549,6 @@ dependencies = [
  "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "wio"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
@@ -4066,15 +3558,6 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "x11"
-version = "2.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "x11-clipboard"
 version = "0.3.3"
@@ -4113,25 +3596,6 @@ name = "xml-rs"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "zerocopy"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "zerocopy-derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [metadata]
 "checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 "checksum ahash 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "6f33b5018f120946c1dcf279194f238a9f146725593ead1c08fa47ff22b0b5d3"
@@ -4148,7 +3612,6 @@ dependencies = [
 "checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
 "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
 "checksum ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
-"checksum ash 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)" = "003d1fb2eb12eb06d4a03dbe02eea67a9fac910fa97932ab9e3a75b96a1ea5e5"
 "checksum atk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8dc233521f7bffd3042c31082ea71bd08820abf44bac938fb36591e20f76f39"
 "checksum atom 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3c86699c3f02778ec07158376991c8f783dd1f2f95c579ffaf0738dc984b2fe2"
 "checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
@@ -4163,20 +3626,16 @@ dependencies = [
 "checksum bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a993f74b4c99c1908d156b8d2e0fb6277736b0ecbd833982fd1241d39b2766a6"
 "checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0"
 "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-"checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
 "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
 "checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
-"checksum bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb8038c1ddc0a5f73787b130f4cc75151e96ed33e417fde765eb5a81e3532f4"
-"checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
 "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum c_vec 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8a318911dce53b5f1ca6539c44f5342c632269f0fa7ea3e35f32458c27a7c30"
 "checksum cairo-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a110f269c2fd382df5fe8bd46dfa5f1b83608aa717fecb6e7a28c08c202f0e13"
 "checksum cairo-sys-rs 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0395175ecba60accac076a02c31d143b9dcd9d5eb5316d7163a3273803b765c7"
-"checksum calloop 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7aa2097be53a00de9e8fc349fea6d76221f398f5c4fa550d420669906962d160"
 "checksum cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
 "checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
 "checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
@@ -4190,24 +3649,20 @@ dependencies = [
 "checksum claxon 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f86c952727a495bda7abaf09bafdee1a939194dd793d9a8e26281df55ac43b00"
 "checksum clipboard-win 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62"
 "checksum cocoa 0.18.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1706996401131526e36b3b49f0c4d912639ce110996f3ca144d78946727bce54"
 "checksum cocoa 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f29f7768b2d1be17b96158e3285951d366b40211320fb30826a76cb7a0da6400"
 "checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
 "checksum colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "433e7ac7d511768127ed85b0c4947f47a254131e37864b2dc13f52aa32cd37e5"
-"checksum colorful 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0bca1619ff57dd7a56b58a8e25ef4199f123e78e503fe1653410350a1b98ae65"
 "checksum conrod_core 0.63.0 (git+https://gitlab.com/veloren/conrod.git)" = "<none>"
 "checksum conrod_derive 0.63.0 (git+https://gitlab.com/veloren/conrod.git)" = "<none>"
 "checksum conrod_winit 0.63.0 (git+https://gitlab.com/veloren/conrod.git)" = "<none>"
 "checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe"
 "checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59"
 "checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
-"checksum copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6ff9c56c9fb2a49c05ef0e431485a22400af20d33226dc0764d891d09e724127"
 "checksum copypasta 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe78fc904c59791fc39ba6ed427d45c1cd81529f5496552c3e10dab17b37409"
 "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
 "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
 "checksum core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9"
-"checksum core-video-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8dc065219542086f72d1e9f7aadbbab0989e980263695d129d502082d063a9d0"
 "checksum coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491"
 "checksum coreaudio-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e8f5954c1c7ccb55340443e8b29fca24013545a5e7d72c1ca7db4fc02b982ce"
 "checksum cpal 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ded070249be850b5b59e1e3a44a70b8ae395e0e5c65b487131d8909a8208120"
@@ -4225,11 +3680,9 @@ dependencies = [
 "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
 "checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d"
 "checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c"
-"checksum d3d12 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc7ed48e89905e5e146bcc1951cc3facb9e44aea9adf5dc01078cda1bd24b662"
 "checksum daggy 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2"
 "checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
 "checksum derivative 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "942ca430eef7a3806595a6737bc388bf51adb888d3fc0dd1b50f1c170167ee3a"
-"checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
 "checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
 "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
@@ -4245,7 +3698,6 @@ dependencies = [
 "checksum euclid_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fdcb84c18ea5037a1c5a23039b4ff29403abce2e0d6b1daa11cf0bde2b30be15"
 "checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
 "checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
-"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 "checksum faster 0.5.0 (git+https://github.com/AdamNiederer/faster.git?rev=6f99e0396e9992222bb33e8fd1e84347b410d9c0)" = "<none>"
 "checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa"
 "checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
@@ -4259,21 +3711,12 @@ dependencies = [
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
 "checksum gdk 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd30051ff3d908ff2fc7e5776ffe1c699821e043809f294c3a61004f11d6c3a9"
 "checksum gdk-pixbuf 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2d2199eba47ebcb9977ce28179649bdd59305ef465c4e6f9b65aaa41c24e6b5"
 "checksum gdk-pixbuf-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df6a3b73e04fafc07f5ebc083f1096a773412e627828e1103a55e921f81187d8"
 "checksum gdk-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3162ff940526ddff71bf1f630facee6b5e05d282d125ba0c4c803842819b80c3"
-"checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d"
 "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
 "checksum gfx 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)" = "01de46f9508a5c259aef105f0bff760ceddca832ea9c87ce03d1923e22ee155b"
-"checksum gfx-auxil 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "572eee952a9a23c99cfe3e4fd95d277784058a89ac3c77ff6fa3d80a4e321919"
-"checksum gfx-backend-dx11 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "11f6df16109433f998a95c4b0c48738100fde9c7ce4c1c4885df1cc78db9115e"
-"checksum gfx-backend-dx12 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "305620be6365b7dd8ef8e2bf320174f7aad4a23efb34136ee5b4d4d28bbe1714"
-"checksum gfx-backend-empty 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d383e6bc48867cb37d298a20139fd1eec298f8f6d594690cd1c50ef25470cc7"
-"checksum gfx-backend-metal 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a38692ee75878a9438e4495325288ee8c65b31409b57b375c7a51858a830cc42"
-"checksum gfx-backend-vulkan 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "62538fedd66a78968a162e8e1a29d085ffbc97f8782634684b2f7da7aea59207"
-"checksum gfx-hal 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7c88981665c780447bb08eb099e1ded330754a7246719bab927ee4a949c0ba7f"
 "checksum gfx_core 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "75fbddaef2e12b4995900539d7209d947b988a3d87ee8737484d049b526e5441"
 "checksum gfx_device_gl 0.16.2 (registry+https://github.com/rust-lang/crates.io-index)" = "109c385fa380c18888633aa27d1e16cbae518469702a2f69dcb5f52d5378bebc"
 "checksum gfx_gl 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8525888d909a6424b04f9136976f07a85fc1f3704555c1a73897e258326c8319"
@@ -4288,7 +3731,6 @@ dependencies = [
 "checksum glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615bef979b5838526aee99241afc80cfb2e34a8735d4bcb8ec6072598c18a408"
 "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 "checksum glsl-include 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "daa2afb1631e7ab4543e0dde0e3fc68bb49c58fee89c07f30a26553b1f684ab6"
-"checksum glsl-to-spirv 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "28caebc98746d507603a2d3df66dcbe04e41d4febad0320f3eec1ef72b6bbef1"
 "checksum glutin 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)" = "938ce7a2b1bbfe1535166133bea3f9c1b46350d2794b49561303575e9e1b9949"
 "checksum glutin_egl_sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "772edef3b28b8ad41e4ea202748e65eefe8e5ffd1f4535f1219793dbb20b3d4c"
 "checksum glutin_emscripten_sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "245b3fdb08df6ffed7585365851f8404af9c7e2dd4b59f15262e968b6a95a0c7"
@@ -4317,7 +3759,6 @@ dependencies = [
 "checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
 "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
 "checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba"
-"checksum js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "7889c7c36282151f6bf465be4700359318aef36baa951462382eae49e9577cf9"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
@@ -4339,7 +3780,6 @@ dependencies = [
 "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 "checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
-"checksum metal 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f83c7dcc2038e12f68493fa3de44235df27b2497178e257185b4b5b5d028a1e4"
 "checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
 "checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
 "checksum minifb 0.13.0 (git+https://github.com/emoon/rust_minifb.git)" = "<none>"
@@ -4370,7 +3810,6 @@ dependencies = [
 "checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
 "checksum objc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
 "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-"checksum objc_exception 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
 "checksum objc_id 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
 "checksum ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15"
 "checksum orbclient 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "f8b18f57ab94fbd058e30aa57f712ec423c0bb7403f8493a6c58eef0c36d9402"
@@ -4380,12 +3819,10 @@ dependencies = [
 "checksum packed_simd 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220"
 "checksum pango 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "45374801e224373c3c0393cd48073c81093494c8735721e81d1dbaa4096b2767"
 "checksum pango-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94039b3921a4af4058a3e4335e5d15099101f298a92f5afc40bab3a3027594a1"
-"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
 "checksum parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e"
 "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
 "checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
 "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
-"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
 "checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
@@ -4431,7 +3868,6 @@ dependencies = [
 "checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 "checksum rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e18c91676f670f6f0312764c759405f13afb98d5d73819840cf72a518487bff"
-"checksum range-alloc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd5927936723a9e8b715d37d7e4b390455087c4bdf25b9f702309460577b14f9"
 "checksum raw-window-handle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9db80d08d3ed847ce4fb3def46de0af4bfb6155bd09bd6eaf28b5ac72541c1f1"
 "checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
 "checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
@@ -4441,10 +3877,7 @@ dependencies = [
 "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
 "checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
 "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
-"checksum relevant 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bbc232e13d37f4547f5b9b42a5efc380cabe5dbc1807f8b893580640b2ab0308"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum rendy-descriptor 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f475bcc0505946e998590f1f0545c52ef4b559174a1b353a7ce6638def8b621e"
-"checksum rendy-memory 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ed492161a819feae7f27f418bb16035276ac20649c60d756699152cb5c1960ec"
 "checksum rodio 0.9.0 (git+https://github.com/RustAudio/rodio?rev=e5474a2)" = "<none>"
 "checksum ron 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5"
 "checksum roots 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e4c67c712ab62be58b24ab8960e2b95dd4ee00aac115c76f2709657821fe376d"
@@ -4469,7 +3902,6 @@ dependencies = [
 "checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
 "checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-"checksum sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9eb6be24e4c23a84d7184280d2722f7f2731fcdd4a9d886efbfe4413e4847ea0"
 "checksum shared_library 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9e7e0f2bfae24d8a5b5a66c5b257a83c7412304311512a0c054cd5e619da11"
 "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
 "checksum shred 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "92472b9bafafbcba21935c6444d924e5332742f6778c49504a49a97eaeff6ccc"
@@ -4486,21 +3918,17 @@ dependencies = [
 "checksum specs 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4943fde8c5d3d14c3d19d2a4c7abbd7b626c270a19e6cd35252294a48feb698c"
 "checksum specs-idvs 0.1.0 (git+https://gitlab.com/veloren/specs-idvs.git)" = "<none>"
 "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-"checksum spirv_cross 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fbbe441b3ac8ec0ae6a4f05234239bd372a241ce15793eef694e8b24afc267bb"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
 "checksum stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
 "checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
-"checksum storage-map 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0a4829a5c591dc24a944a736d6b1e4053e51339a79fd5d4702c4c999a9c45e"
 "checksum sum_type 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da5b4a0c9f3c7c8e891e445a7c776627e208e8bba23ab680798066dd283e6a15"
 "checksum svg_fmt 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20e5f95e89d737f30cd1f98a9af9a85c2a1cc162cfedfba5a0c54cf92d7206fc"
 "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b"
 "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
 "checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92"
-"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
 "checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
@@ -4514,7 +3942,6 @@ dependencies = [
 "checksum treeculler 0.1.0 (git+https://gitlab.com/yusdacra/treeculler.git)" = "<none>"
 "checksum tuple_utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
 "checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
-"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
 "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
@@ -4523,18 +3950,12 @@ dependencies = [
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 "checksum uvth 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e59a167890d173eb0fcd7a1b99b84dc05c521ae8d76599130b8e19bef287abbf"
-"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 "checksum vek 0.9.11 (registry+https://github.com/rust-lang/crates.io-index)" = "1eb3ca8ea588deba055424cc1a79a830428b2f6c270b8d8f91946f660fa4d8ee"
 "checksum vektor 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "42e86fbee9ad5d7dd720dbe6dd2e47c598d98632d707e18ed5186bd284e933da"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
 "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
-"checksum wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "5205e9afdf42282b192e2310a5b463a6d1c1d774e30dc3c791ac37ab42d2616c"
-"checksum wasm-bindgen-backend 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "11cdb95816290b525b32587d76419facd99662a07e59d3cdb560488a819d9a45"
-"checksum wasm-bindgen-macro 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "574094772ce6921576fb6f2e3f7497b8a76273b6db092be18fc48a082de09dc3"
-"checksum wasm-bindgen-macro-support 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "e85031354f25eaebe78bb7db1c3d86140312a911a106b2e29f9cc440ce3e7668"
-"checksum wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f5e7e61fc929f4c0dddb748b102ebf9f632e2b8d739f2016542b4de2965a9601"
 "checksum wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
 "checksum wayland-client 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda"
 "checksum wayland-commons 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
@@ -4545,8 +3966,6 @@ dependencies = [
 "checksum wayland-scanner 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d"
 "checksum wayland-sys 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)" = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
 "checksum wayland-sys 0.23.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4"
-"checksum wgpu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e9c1ff587eddd68cdf2a78889c7a2128683161c72c67b94457cf498accaf7b"
-"checksum wgpu-native 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "282dea6c13cfab27737dc34f131dd1ba72ff990f61c27f57f9299bec3d1c5de5"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
@@ -4555,15 +3974,10 @@ dependencies = [
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 "checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
 "checksum winit 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8"
-"checksum winit 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ba128780050481f453bec2a115b916dbc6ae79c303dee9bad8b9080bdccd4f5"
 "checksum winres 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc"
-"checksum wio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-"checksum x11 2.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39697e3123f715483d311b5826e254b6f3cfebdd83cf7ef3358f579c3d68e235"
 "checksum x11-clipboard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "89bd49c06c9eb5d98e6ba6536cf64ac9f7ee3a009b2f53996d405b3944f6bcea"
 "checksum x11-dl 2.18.4 (registry+https://github.com/rust-lang/crates.io-index)" = "be65e1342a3baae65439cd03306778831a3d133b0d20243a7fb83fd5cf403c58"
 "checksum xcb 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de"
 "checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
 "checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"
-"checksum zerocopy 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "992b9b31f80fd4a167f903f879b8ca43d6716cc368ea01df90538baa2dd34056"
-"checksum zerocopy-derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b090467ecd0624026e8a6405d343ac7382592530d54881330b3fc8e400280fa5"
diff --git a/Cargo.toml b/Cargo.toml
index 387765c9a6..f4a8194459 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,8 @@ opt-level = 2
 opt-level = 2
 [profile.dev.package."veloren-world"]
 opt-level = 2
-[profile.no_overflow.overrides."veloren-world"]
+
+[profile.no_overflow.package."veloren-world"]
 opt-level = 3
 
 # this profile is used by developers if dev doesn't has enough debug information, the name must != debug, as debug is used by dev because....
diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index 4faa0f7bf7..e571e175c7 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -19,8 +19,8 @@ use crate::{
 use client::Client;
 use common::{
     comp,
-    terrain::{BlockKind, TerrainChunk, TerrainChunkSize},
-    vol::{ReadVol, RectVolSize},
+    terrain::{BlockKind, TerrainChunk},
+    vol::ReadVol,
 };
 use specs::{Join, WorldExt};
 use vek::*;
diff --git a/world/src/block/mod.rs b/world/src/block/mod.rs
index 5f1b088dd2..3bae06e6ee 100644
--- a/world/src/block/mod.rs
+++ b/world/src/block/mod.rs
@@ -3,13 +3,11 @@ mod natural;
 use crate::{
     column::{ColumnGen, ColumnSample},
     generator::{Generator, TownGen},
-    sim::WorldSim,
     util::{RandomField, Sampler, SmallCache},
     CONFIG,
 };
 use common::{
     terrain::{structure::StructureBlock, Block, BlockKind, Structure},
-    util::saturate_srgb,
     vol::{ReadVol, Vox},
 };
 use std::ops::{Add, Div, Mul, Neg};
diff --git a/world/src/generator/town/mod.rs b/world/src/generator/town/mod.rs
index 8a44eff32b..f472753d2c 100644
--- a/world/src/generator/town/mod.rs
+++ b/world/src/generator/town/mod.rs
@@ -4,7 +4,7 @@ mod vol;
 use super::{Generator, SpawnRules};
 use crate::{
     block::{block_from_structure, BlockGen},
-    column::{ColumnGen, ColumnSample},
+    column::ColumnSample,
     util::Sampler,
     CONFIG,
 };
diff --git a/world/src/sim/diffusion.rs b/world/src/sim/diffusion.rs
index 5e7cc82575..9ba06c2510 100644
--- a/world/src/sim/diffusion.rs
+++ b/world/src/sim/diffusion.rs
@@ -63,15 +63,13 @@ pub fn diffusion(
     let mut zint: Vec<f64>;
     let mut kdint: Vec<f64>;
     let mut zintp: Vec<f64>;
-    let mut i: usize;
-    let mut j: usize;
     let mut ij: usize;
     let mut factxp: f64;
     let mut factxm: f64;
     let mut factyp: f64;
     let mut factym: f64;
-    let mut dx: f64;
-    let mut dy: f64;
+    let dx: f64;
+    let dy: f64;
     /*
       character cbc*4
 
@@ -93,7 +91,7 @@ pub fn diffusion(
     */
     zint = vec![Default::default(); nx * ny];
     kdint = vec![Default::default(); nx * ny];
-    zintp = vec![Default::default(); nx * ny];
+    // zintp = vec![Default::default(); nx * ny];
     /*
       do j=1,ny
         do i=1,nx
@@ -381,7 +379,7 @@ pub fn diffusion(
         }
     }
 
-    b.par_iter_mut().zip(h).for_each(|(mut b, h)| {
+    b.par_iter_mut().zip(h).for_each(|(b, h)| {
         *b = h.min(*b);
     });
     /*
@@ -415,9 +413,7 @@ pub fn tridag(a: &[f64], b: &[f64], c: &[f64], r: &[f64], u: &mut [f64], n: usiz
 
           if(b(1).eq.0.d0) stop 'in tridag'
     */
-    let mut j: usize;
     let mut bet: f64;
-    let mut precision: f64;
     let mut gam: Vec<f64>;
 
     gam = vec![Default::default(); n];
diff --git a/world/src/sim/erosion.rs b/world/src/sim/erosion.rs
index 590d917cc9..36c2a7b23f 100644
--- a/world/src/sim/erosion.rs
+++ b/world/src/sim/erosion.rs
@@ -3,21 +3,18 @@ use super::{
     NEIGHBOR_DELTA, WORLD_SIZE,
 };
 use crate::{config::CONFIG, util::RandomField};
-use arr_macro::arr;
-use bitvec::prelude::{bitbox, bitvec, BitBox};
 use common::{terrain::TerrainChunkSize, vol::RectVolSize};
-use faster::*;
+// use faster::*;
 use itertools::izip;
 use noise::{NoiseFn, Point3};
-use num::{Float, FromPrimitive, One, Zero};
+use num::{Float, Zero};
 use ordered_float::NotNan;
-use packed_simd::{/*f32x8, f64x8,*/ m32, m64};
+use packed_simd::m32;
 use rayon::prelude::*;
 use std::{
     cmp::{Ordering, Reverse},
     collections::BinaryHeap,
     f32, f64, fmt, mem,
-    path::PathBuf,
     time::Instant,
     u32,
 };
@@ -28,7 +25,7 @@ pub type Alt = f64;
 pub type Compute = f64;
 pub type Computex8 = [Compute; 8];
 
-/// This is a fast approximation of powf. This should only be used when minor accuracy loss is acceptable.
+/* /// This is a fast approximation of powf. This should only be used when minor accuracy loss is acceptable.
 #[inline(always)]
 #[allow(unsafe_code)]
 fn approx_powf(b: f32, e: f32) -> f32 {
@@ -44,7 +41,7 @@ fn approx_powf(b: f32, e: f32) -> f32 {
         b.a[0] = 0;
         b.f as f32
     }
-}
+} */
 
 /// Compute the water flux at all chunks, given a list of chunk indices sorted by increasing
 /// height.
@@ -236,7 +233,7 @@ pub fn get_rivers<F: fmt::Debug + Float + Into<f64>, G: Float + Into<f64>>(
     let chunk_area_factor = neighbor_coef.x * neighbor_coef.y * mins_per_sec;
     // NOTE: This technically makes us discontinuous, so we should be cautious about using this.
     let derivative_divisor = 1.0;
-    let height_scale = 1.0; // 1.0 / CONFIG.mountain_scale as f64;
+    // let height_scale = 1.0; // 1.0 / CONFIG.mountain_scale as f64;
     newh.into_iter().rev().for_each(|&chunk_idx| {
         let chunk_idx = chunk_idx as usize;
         let downhill_idx = downhill[chunk_idx];
@@ -326,7 +323,7 @@ pub fn get_rivers<F: fmt::Debug + Float + Into<f64>, G: Float + Into<f64>>(
             let pass_idx = (-indirection_idx) as usize;
             /* let pass_pos = uniform_idx_as_vec2(pass_idx);
             let lake_direction = neighbor_coef * (neighbor_pass_pos - pass_pos).map(|e| e as f64); */
-            let pass = &rivers[pass_idx];
+            // let pass = &rivers[pass_idx];
             /* // Our side of the pass must have already been traversed (even if our side of the pass
             // is the lake bottom), so we acquire its computed river_spline_derivative.
             debug_assert!(pass.is_lake()); */
@@ -711,9 +708,8 @@ fn erode(
     // a: &mut [Alt],
     // Height above sea level of water
     wh: &mut [Alt],
-    is_done: &mut BitBox,
-    done_val: bool,
-    erosion_base: f32,
+    // is_done: &mut BitBox,
+    //  done_val: bool,
     max_uplift: f32,
     max_g: f32,
     kdsed: f64,
@@ -768,7 +764,7 @@ fn erode(
     // let l = /*200.0 * max_uplift as f64;*/(1.0e-2 /*/ CONFIG.mountain_scale as f64*/ * height_scale);
     // let l_tot = l * dt;
     // Debris flow coefficient (m / year).
-    let k_df = 1.0e-4/*0.0*/;
+    // let k_df = 1.0e-4/*0.0*/;
     // Debris flow area coefficient (m^(-2q)).
     let q = 0.2;
     let q_ = /*1.0*/1.5/*1.0*/;
@@ -832,19 +828,19 @@ fn erode(
     /* let n = 2.4;// 1.0;//1.5;//2.4;//1.0;
     let m = n * 0.5;// n * 0.4;// 0.96;// 0.4;//0.6;//0.96;//0.4; */
     // Stream power erosion constant (bedrock), in m^(1-2m) / year  (times dt).
-    let k_fb = // erosion_base as f64 + 2.244 / mmaxh as f64 * max_uplift as f64;
-        // 2.244*(5.010e-4)/512*5- (1.097e-5)
-        // 2.244*(5.010e-4)/2048*5- (1.097e-5)
-        // 2.244*(5.010e-4)/512- (8e-6)
-        // 2.244*(5.010e-4)/512- (2e-6)
-        // 2e-6 * dt;
-        // 8e-6 * dt
-        // 2e-5 * dt;
-        // 2.244/2048*5*32/(250000/4)*10^6
-        // ln(tan(30/360*2*pi))-ln(tan(6/360*2*pi))*1500 = 3378
-        //erosion_base as f64 + 2.244 / mmaxh as f64 * /*10.0*//*5.0*//*9.0*//*7.5*//*5.0*//*2.5*//*1.5*//*5.0*//*1.0*//*1.5*//*2.5*//*3.75*/ * max_uplift as f64;
-        // 2.5e-6 * dt;
-        2e-5 * dt;
+    /* let k_fb = // erosion_base as f64 + 2.244 / mmaxh as f64 * max_uplift as f64;
+    // 2.244*(5.010e-4)/512*5- (1.097e-5)
+    // 2.244*(5.010e-4)/2048*5- (1.097e-5)
+    // 2.244*(5.010e-4)/512- (8e-6)
+    // 2.244*(5.010e-4)/512- (2e-6)
+    // 2e-6 * dt;
+    // 8e-6 * dt
+    // 2e-5 * dt;
+    // 2.244/2048*5*32/(250000/4)*10^6
+    // ln(tan(30/360*2*pi))-ln(tan(6/360*2*pi))*1500 = 3378
+    //erosion_base as f64 + 2.244 / mmaxh as f64 * /*10.0*//*5.0*//*9.0*//*7.5*//*5.0*//*2.5*//*1.5*//*5.0*//*1.0*//*1.5*//*2.5*//*3.75*/ * max_uplift as f64;
+    // 2.5e-6 * dt;
+    2e-5 * dt; */
     // see http://geosci.uchicago.edu/~kite/doc/Whipple_and_Tucker_1999.pdf
     //5e-6 * dt; // 2e-5 was designed for steady state uplift of 2mm / y whih would amount to 500 m / 250,000 y.
     // (2.244*(5.010e-4)/512)/(2.244*(5.010e-4)/2500) = 4.88...
@@ -852,13 +848,13 @@ fn erode(
     // Stream power erosion constant (sediment), in m^(1-2m) / year (times dt).
     let k_fs_mult_sed = /*1.0;*//*2.0*/4.0; /*1.0;*///2.0;/*1.5*/;
     // Stream power erosion constant (underwater).
-    let k_fs_mult_water = /*1.0*//*0.5*/0.25;
+    // let k_fs_mult_water = /*1.0*//*0.5*/0.25;
     let g_fs_mult_sed = 1.0/*0.5*/;
     // let k_fs = k_fb * 1.0/*1.5*//*2.0*//*2.0*//*4.0*/;
     // u = k * h_max / 2.244
     // let uplift_scale = erosion_base as f64 + (k_fb * mmaxh / 2.244 / 5.010e-4 as f64 * mmaxh as f64) * dt;
     let (
-        (dh, indirection, newh, maxh, mrec, mstack, mwrec, area),
+        (dh, /*indirection, */ newh, maxh, mrec, mstack, mwrec, area),
         (mut max_slopes, /*(ht, at)*/ h_t),
     ) = rayon::join(
         || {
@@ -871,7 +867,7 @@ fn erode(
                 },
             );
             log::debug!("Computed downhill...");
-            let (boundary_len, indirection, newh, maxh) = get_lakes(
+            let (boundary_len, _indirection, newh, maxh) = get_lakes(
                 |posi| h[posi], /* + uplift(posi) as Alt*/
                 /* + a[posi].max(0.0)*//* + uplift(posi) as Alt*/
                 &mut dh,
@@ -892,7 +888,9 @@ fn erode(
             // let area = get_drainage(&newh, &dh, boundary_len);
             let area = get_multi_drainage(&mstack, &mrec, &*mwrec, boundary_len);
             log::debug!("Got flux...");
-            (dh, indirection, newh, maxh, mrec, mstack, mwrec, area)
+            (
+                dh, /*indirection, */ newh, maxh, mrec, mstack, mwrec, area,
+            )
         },
         || {
             rayon::join(
@@ -928,7 +926,7 @@ fn erode(
 
     type SimdType = f32;
     type MaskType = m32;
-    let simd_func = /*f64s*/f32s;
+    //  let simd_func = /*f64s*/f32s;
 
     // Precompute factors for Stream Power Law.
     let czero = </*Compute*/SimdType as Zero>::zero();
@@ -1014,7 +1012,7 @@ fn erode(
                         // Higher rock strength tends to lead to higher curvature?
                         let kd_factor =
                             // 1.0;
-                            (/*1.0 / */(max_slope / mid_slope/*.sqrt()*//*.powf(0.03125)*/).powf(/*2.0*/2.0/* * q*/))/*.min(kdsed)*/;
+                            /*(1.0 / */(max_slope / mid_slope/*.sqrt()*//*.powf(0.03125)*/).powf(/*2.0*/2.0/* * q*/)/*).min(kdsed)*/;
                         let k_da = k_da /*/ /*max_slope*/*/ * kd_factor;// .powf(q/* / q_*/);
 
                         // let k_df = /*uplift_i*/0.05e-3 / (1.0 + k_da * /*chunk_area_pow*/(10_000.0).powf(q)) / max_slope.powf(q_);
@@ -1169,7 +1167,7 @@ fn erode(
     assert!(mstack.len() == dh.len());
     assert!(b.len() == dh.len());
     assert!(h_t.len() == dh.len());
-    let mut mstack_inv = &mut *mstack_inv;
+    let mstack_inv = &mut *mstack_inv;
     mstack.iter().enumerate().for_each(|(stacki, &posi)| {
         let posi = posi as usize;
         mstack_inv[posi] = stacki;
@@ -1215,7 +1213,7 @@ fn erode(
                     (&mut *h_p, &*h_stack)
                         .into_par_iter()
                         // .enumerate()
-                        .for_each(|(/*stacki, */((mut h_p, h_)/*, wh_*/))| {
+                        .for_each(|(/*stacki, ((*/h_p, h_/*), wh_*//*)*/)| {
                             *h_p = (*h_)/*.max(*wh_)*/ as Compute/* + (0.5 - (stacki & 1) as Compute) * err as Compute*/;
                         });
                     /* hp.par_iter_mut().zip(h.par_iter()).for_each(|(mut hp, h)| {
@@ -1236,7 +1234,7 @@ fn erode(
                 {
                     // calculate erosion/deposition of sediment at each node
                     (&*mstack, &mut *deltah, &*h_t_stack, &*h_stack).into_par_iter()/*.enumerate()*/
-                        .for_each(|(/*stacki, */(&posi, mut deltah, &h_t_i, &h_i))| {
+                        .for_each(|(/*stacki, (*/&posi, deltah, &h_t_i, &h_i/*)*/)| {
                             let posi = posi as usize;
                             /* assert_eq!(mstack_inv[posi], stacki);
                             assert_eq!(h_t[posi], h_t_i); */
@@ -1295,7 +1293,7 @@ fn erode(
                 /* lake_sediment[posi] = deltah_sediment[posi];
                 lake_alluvium[posi] = deltah_alluvium[posi]; */
             } else {
-                let posj = posj as usize;
+                // let posj = posj as usize;
                 let uplift_i = uplift(posi) as Alt;
                 /* if (deltah[posi] - (deltah_sediment[posi] + deltah_alluvium[posi])).abs() > 1.0e-2 {
                     println!("deltah_sediment: {:?}, deltah_alluvium: {:?}, deltah: {:?}, hp: {:?}, ap: {:?}, h_p: {:?}, ht: {:?}, at: {:?}, h: {:?}, a: {:?}, h_: {:?}",
@@ -1372,7 +1370,7 @@ fn erode(
         // enddo
 
         let start_time = Instant::now();
-        (&*mstack, &mut *elev, &*dh_stack, &*h_t_stack, &*area_stack, &*deltah, &*h_p, &*b_stack).into_par_iter()./*enumerate().*/for_each(|(/*stacki, */(&posi, mut elev, &dh_i, &h_t_i, &area_i, &deltah_i, &h_p_i, &b_i))| {
+        (&*mstack, &mut *elev, &*dh_stack, &*h_t_stack, &*area_stack, &*deltah, &*h_p, &*b_stack).into_par_iter()./*enumerate().*/for_each(|(/*stacki, (*/&posi, elev, &dh_i, &h_t_i, &area_i, &deltah_i, &h_p_i, &b_i/*)*/)| {
             let posi = posi as usize;
             /* assert_eq!(mstack_inv[posi], stacki);
             assert_eq!(dh_i, dh[posi]);
@@ -1411,7 +1409,7 @@ fn erode(
                 // actually was material to deposit.  The current assumption is that as long as we
                 // are storing at most as much sediment as there actually was along the river, we
                 // are in the clear.
-                let g_i_ratio = (g_i / (p * area_i))/*.min(1.0)*/;
+                let g_i_ratio = /*(*/g_i / (p * area_i)/*).min(1.0)*/;
                 // One side of nonlinear equation (23):
                 //
                 // h_i(t) + U_i * Δt + G / (p̃ * Ã_i) * Σ{j ∈ upstream_i(t)}(h_j(t, FINAL) + U_j * Δt - h_j(t + Δt, k))
@@ -1444,22 +1442,22 @@ fn erode(
         /* let mut k_df_weights = [0.0; 8];
         let mut k_fs_weights = [0.0; 8];
         let mut rec_heights = [0.0; 8]; */
-        let mut simd_buf = [0.0; 8];
+        /* let mut simd_buf = [0.0; 8];
         let mut simd_buf2 = [0.0; 8];
-        let mut simd_buf3 = [0.0; 8];
+        let mut simd_buf3 = [0.0; 8]; */
         /*&*newh*/
         itertools::izip!(&*mstack, &*elev, /*&mut *wh, */&*b_stack/*, &mut *h_stack*/, &*h_t_stack, &*dh_stack, &*h_p)
         .enumerate()
         .rev()
         .for_each(|(stacki, (&posi, &elev_i, /*wh_i, */&b_i, /*h_i, */&h_t_i, &dh_i, &h_p_i))| {
-            let mut iteration_error = 0.0;
+            let iteration_error = 0.0;
             let posi = posi as usize;
             /* assert_eq!(mstack_inv[posi], stacki);
             assert_eq!(dh_i, dh[posi]);
             assert_eq!(h_t_i, h_t[posi]);
             assert_eq!(b_i, b[posi]); */
             let old_elev_i = /*h*//*elev[posi]*/elev_i as f64;
-            let old_wh_i = wh[posi]/*wh_i*/;
+            // let old_wh_i = wh[posi]/*wh_i*/;
             let old_b_i = /*b[posi]*/b_i;
             let old_ht_i = /*ht*//*h_t[posi]*/h_t_i;
             let sed = (old_ht_i - old_b_i) as f64;
@@ -1484,7 +1482,7 @@ fn erode(
             } else {
                 // *is_done.at(posi) = done_val;
                 let posj = posj as usize;
-                let posj_stack = mstack_inv[posj];
+                // let posj_stack = mstack_inv[posj];
                 // let dxy = (uniform_idx_as_vec2(posi) - uniform_idx_as_vec2(posj)).map(|e| e as f64);
 
                 // Has an outgoing flow edge (posi, posj).
@@ -1500,7 +1498,7 @@ fn erode(
                 // h[i](t + dt) = (h[i](t) + δt * (uplift[i] + flux(i) * h[j](t + δt))) / (1 + flux(i) * δt).
                 // NOTE: posj has already been computed since it's downhill from us.
                 // Therefore, we can rely on wh being set to the water height for that node.
-                let h_j = h[posj_stack] as f64;
+                // let h_j = h[posj_stack] as f64;
                 // let a_j = a[posj] as f64;
                 let wh_j = wh[posj] as f64;
                 // let old_a_i = a[posi] as f64;
@@ -1526,7 +1524,7 @@ fn erode(
 
                 // Only perform erosion if we are above the water level of the previous node.
                 if old_elev_i > wh_j/*h_j*//*h_j*//*h[posj]*/ {
-                    let mut dtherm = 0.0f64;
+                    let dtherm = 0.0f64;
                     /* {
                         // Thermal erosion (landslide)
                         let dxy = (uniform_idx_as_vec2(posi) - uniform_idx_as_vec2(posj)).map(|e| e as f64);
@@ -1575,7 +1573,7 @@ fn erode(
                         k_fs_fact
                     }; */
                     // let elev_j = h_j/* + a_j.max(0.0)*/;
-                    let new_ht_i = (old_ht_i/* + uplift(posi) as f64*/);
+                    // let new_ht_i = (old_ht_i/* + uplift(posi) as f64*/);
                     if /*n == 1.0*/(n - 1.0).abs() <= 1.0e-3/*f64::EPSILON*/ && (q_ - 1.0).abs() <= 1.0e-3 {
                         let mut f = h0;
                         let mut df = 1.0;
@@ -1604,14 +1602,14 @@ fn erode(
                     } else {
                         // Local Newton-Raphson
                         let omega1 = 0.875f64 * n;
-                        let omega2 = 0.875f64 / q_;/*if q_ < 0.5 { 0.875f64/* * q_*/ } else { 0.875f64 / q_ }*/;
+                        let omega2 = 0.875f64 / q_/*if q_ < 0.5 { 0.875f64/* * q_*/ } else { 0.875f64 / q_ }*/;
                         let omega = omega1.max(omega2);
                         let tolp = 1.0e-3/*1.0e-4*/;
                         // let tolp = tol;
                         let mut errp = 2.0 * tolp;
                         // let h0 = old_elev_i + (new_h_i - old_h_i);
                         // let mut count = 0;
-                        let mut max = 0usize;
+                        // let mut max = 0usize;
                         /* let mut k_df_weights = [0.0; 8];//f64s(0.0);//f64x8::splat(0.0);
                         let mut k_fs_weights = [0.0; 8];//f64s(0.0);//f64x8::splat(0.0);
                         let n_weights = simd_func(n as SimdType - 1.0);
@@ -1653,7 +1651,7 @@ fn erode(
                                 }; 8];
                             (arr, max)
                         }; */
-                        assert!(max <= 8);
+                        // assert!(max <= 8);
                         /* let k_fs_weights = &k_fs_weights[..max];
                         let k_df_weights = &k_df_weights[..max];
                         let rec_heights = &rec_heights[..max];
@@ -1789,7 +1787,7 @@ fn erode(
                                 if /*mask[kk]*/mask_kk.test() {
                                     let h_j = rec_heights_kk;//rec_heights[kk];
                                     let elev_j = h_j/* + a_j.max(0.0)*/;
-                                    let dh = 0.0.max((new_h_i as SimdType - elev_j)/*.abs()*/);
+                                    let dh = 0.0.max(/*(*/new_h_i as SimdType - elev_j/*).abs()*/);
                                     let powf = |a: SimdType, b| a.powf(b);
                                     // let powf = |a, b| approx_powf(a as f32, b as f32) as SimdType;
                                     let dh_fs_sample = /*k_fs_fact[kk]*/k_fs_fact_kk as /*f64*/SimdType * powf(dh, n as SimdType - 1.0);
@@ -2139,9 +2137,9 @@ fn erode(
 
         err = (sum_err / /*newh*/mstack.len() as Compute).sqrt();
         log::debug!("(RMSE: {:?})", err);
-        /* if max_g == 0.0 {
+        if max_g == 0.0 {
             err = 0.0;
-        } */
+        }
         if n_gs_stream_power_law == max_n_gs_stream_power_law {
             log::warn!(
                 "Beware: Gauss-Siedel scheme not convergent: err={:?}, expected={:?}",
@@ -2210,7 +2208,7 @@ fn erode(
     b.par_iter_mut()
         .zip_eq(h.par_iter())
         .enumerate()
-        .for_each(|(posi, (mut b, &h_i))| {
+        .for_each(|(posi, (b, &h_i))| {
             let old_b_i = *b;
             let uplift_i = uplift(posi) as Alt;
 
@@ -2257,25 +2255,30 @@ fn erode(
     log::debug!("Done updating basement and applying soil production...");
 
     // update the height to reflect sediment flux.
-    (&mut *h, &*mstack_inv)
-        .into_par_iter()
-        .enumerate()
-        .for_each(|(posi, (mut h, &stacki))| {
-            let lposi = lake_sill[stacki];
-            if lposi >= 0 {
-                let lposi = lposi as usize;
-                if lake_water_volume[lposi] > 0.0 {
-                    // +max(0.d0,min(lake_sediment(lake_sill(ij)),lake_water_volume(lake_sill(ij))))/
-                    // lake_water_volume(lake_sill(ij))*(water(ij)-h(ij))
-                    *h += (0.0.max(
-                        /*lake_sediment[lposi]*/
-                        lake_silt[stacki].min(lake_water_volume[lposi]),
-                    ) / lake_water_volume[lposi]
-                        * (wh[posi]/* - a[posi].max(0.0)*/ - *h) as Compute)
-                        as Alt;
+    if max_g > 0.0 {
+        //  If max_g  = 0.0, lake_silt will be too high during the first iteration since our
+        //  initial estimate for h is very poor; however, the elevation estimate will have been
+        //  unaffected by g.
+        (&mut *h, &*mstack_inv)
+            .into_par_iter()
+            .enumerate()
+            .for_each(|(posi, (h, &stacki))| {
+                let lposi = lake_sill[stacki];
+                if lposi >= 0 {
+                    let lposi = lposi as usize;
+                    if lake_water_volume[lposi] > 0.0 {
+                        // +max(0.d0,min(lake_sediment(lake_sill(ij)),lake_water_volume(lake_sill(ij))))/
+                        // lake_water_volume(lake_sill(ij))*(water(ij)-h(ij))
+                        *h += (0.0.max(
+                            /*lake_sediment[lposi]*/
+                            lake_silt[stacki].min(lake_water_volume[lposi]),
+                        ) / lake_water_volume[lposi]
+                            * (wh[posi]/* - a[posi].max(0.0)*/ - *h) as Compute)
+                            as Alt;
+                    }
                 }
-            }
-        });
+            });
+    }
     // do ij=1,nn
     //   if (lake_sill(ij).ne.0) then
     //     if (lake_water_volume(lake_sill(ij)).gt.0.d0) h(ij)=h(ij) &
@@ -2349,9 +2352,9 @@ fn erode(
         let max_slope = max_slopes[posi];
         // Remember k_d for this chunk in max_slopes.
         // higher max_slope => much lower kd_factor.
-        let kd_factor =
+        /* let kd_factor =
             // 1.0;
-            (1.0 / (max_slope / mid_slope/*.sqrt()*//*.powf(0.03125)*/).powf(/*2.0*/2.0))/*.min(kdsed)*/;
+            (1.0 / (max_slope / mid_slope/*.sqrt()*//*.powf(0.03125)*/).powf(/*2.0*/2.0))/*.min(kdsed)*/; */
         let n = n_f(posi);
         max_slopes[posi] = if sed > sediment_thickness(n) && kdsed > 0.0 {
             // Sediment
@@ -2377,7 +2380,7 @@ fn erode(
             let posj = posj as usize;
             // Find the water height for this chunk's receiver; we only apply thermal erosion
             // for chunks above water.
-            let mut wh_j = wh[posj] as f64;
+            let wh_j = wh[posj] as f64;
             // If you're on the lake bottom and not right next to your neighbor, don't compute a
             // slope.
             let mut new_h_i = /*old_h_i*//*old_h_i + old_a_i.max(0.0)*/old_h_i; /*old_b_i;*/
@@ -2421,12 +2424,12 @@ fn erode(
                     // exactly max_slope.
                     // max_slope = (old_h_i + dh - h_j) / height_scale/* * CONFIG.mountain_scale */ / NEIGHBOR_DISTANCE
                     // dh = max_slope * NEIGHBOR_DISTANCE * height_scale/* / CONFIG.mountain_scale */ + h_j - old_h_i.
-                    let dh = max_slope * neighbor_distance/* * height_scale*//* / CONFIG.mountain_scale as f64*/;
+                    // let dh = max_slope * neighbor_distance/* * height_scale*//* / CONFIG.mountain_scale as f64*/;
                     // new_h_i = /*h_j.max*//*(h_k + dh).max*/(/*new_h_i*/ht[posi] as f64 + l_tot * (mag_slope - max_slope));
                     // new_h_i = /*h_j.max*//*(h_k + dh).max*/(/*new_h_i*/h_k + dh + l_tot * (mag_slope - max_slope));
                     // new_h_i = /*h_j.max*//*(h_k + dh).max*/(new_h_i - l_tot * (mag_slope - max_slope));
                     let dtherm = 0.0/*dz - dh*//*(l_tot * (mag_slope - max_slope)).min(/*(dz/* - dh*/) / 2.0*/(1.0 + max_g) * max_uplift as f64)*/;
-                    new_h_i = /*h_j.max*//*(h_k + dh).max*/(/*new_h_i*//*h_k + dh*/new_h_i - dtherm);
+                    new_h_i = /*h_j.max*//*(h_k + dh).max*//*(new_h_i*//*h_k + dh*/new_h_i - dtherm/*)*/;
                     /* let new_h_j = (old_h_j + dtherm).min(old_h_j.max(new_h_i));
                     h[posj] = new_h_j as Alt;
                     wh_j = wh_j.max(new_h_j);
@@ -3032,7 +3035,7 @@ pub fn get_lakes<F: Float>(
                     tag[pass_idx] = Tag::InQueue;
 
                     let outflow_coords = uniform_idx_as_vec2(neighbor_pass_idx);
-                    let elev = h(neighbor_pass_idx).max(h(pass_idx));;
+                    let elev = h(neighbor_pass_idx).max(h(pass_idx));
 
                     while let Some(node) = filling_queue.pop() {
                         let coords = uniform_idx_as_vec2(node);
@@ -3047,8 +3050,8 @@ pub fn get_lakes<F: Float>(
                                 return;
                             }
                             let dxy = (uniform_idx_as_vec2(ineighbor) - coords).map(|e| e as f64);
-                            let neighbor_distance = (/*neighbor_coef * */dxy);
-                            let mut tag = &mut tag[ineighbor];
+                            let neighbor_distance = /*neighbor_coef * */dxy;
+                            let tag = &mut tag[ineighbor];
                             match *tag {
                                 Tag::WithRcv => {
                                     // TODO: Remove outdated comment.
@@ -3066,7 +3069,7 @@ pub fn get_lakes<F: Float>(
                                     //
                                     // Which is also the scalar component of vec_to_outflow in the
                                     // direction of vec_to_neighbor.
-                                    let cost = (outflow_distance.dot(neighbor_distance / neighbor_distance.magnitude()))/*.abs()*/;
+                                    let cost = /*(*/outflow_distance.dot(neighbor_distance / neighbor_distance.magnitude())/*).abs()*/;
                                     if cost > rcv_cost {
                                         rcv = ineighbor as isize;
                                         rcv_cost = cost;
@@ -3176,12 +3179,12 @@ pub fn get_multi_rec<F: fmt::Debug + Float + Sync + Into<Compute>>(
     let nn = nx * ny;
     let dxdy = Vec2::new(dx, dy);
 
-    // set bc
+    /* // set bc
     let i1 = 0;
     let i2 = nx;
     let j1 = 0;
     let j2 = ny;
-    /* let xcyclic = false;
+    let xcyclic = false;
     let ycyclic = false; */
     /*
       write (cbc,'(i4)') ibc
@@ -3278,7 +3281,7 @@ pub fn get_multi_rec<F: fmt::Debug + Float + Sync + Into<Compute>>(
                 wh_ij > wh_ijk {
                     // Set neighboring edge lower than this one as being downhill.
                     // NOTE: relying on at most 8 neighbors.
-                    mrec_ij |= (1 << k);
+                    mrec_ij |= 1 << k;
                 } else if
                 /*h_ijk*/
                 wh_ijk > wh_ij {
@@ -3395,7 +3398,6 @@ pub fn get_multi_rec<F: fmt::Debug + Float + Sync + Into<Compute>>(
 
 /// Perform erosion n times.
 pub fn do_erosion(
-    erosion_base: f32,
     _max_uplift: f32,
     n_steps: usize,
     seed: &RandomField,
@@ -3534,7 +3536,7 @@ pub fn do_erosion(
     let height_scale = |n| height_scale(n);
     let k_da_scale = |q| k_da_scale(q);
     // Hillslope diffusion coefficient for sediment.
-    let mut is_done = bitbox![0; WORLD_SIZE.x * WORLD_SIZE.y];
+    // let mut is_done = bitbox![0; WORLD_SIZE.x * WORLD_SIZE.y];
     (0..n_steps).for_each(|i| {
         log::debug!("Erosion iteration #{:?}", i);
         erode(
@@ -3542,12 +3544,11 @@ pub fn do_erosion(
             &mut b,
             // &mut a,
             &mut wh,
-            &mut is_done,
-            // The value to use to indicate that erosion is complete on a chunk.  Should toggle
+            // &mut is_done,
+            /* // The value to use to indicate that erosion is complete on a chunk.  Should toggle
             // once per iteration, to avoid having to reset the bits, and start at true, since
             // we initialize to 0 (false).
-            i & 1 == 0,
-            erosion_base,
+            i & 1 == 0, */
             max_uplift,
             max_g,
             // -1.0,
diff --git a/world/src/sim/map.rs b/world/src/sim/map.rs
index d43c789f48..e09ea26bb0 100644
--- a/world/src/sim/map.rs
+++ b/world/src/sim/map.rs
@@ -1,6 +1,5 @@
 use crate::{
-    sim::{self, uniform_idx_as_vec2, RiverKind, WorldSim, WORLD_SIZE},
-    util::Sampler,
+    sim::{RiverKind, WorldSim, WORLD_SIZE},
     CONFIG,
 };
 use common::{terrain::TerrainChunkSize, vol::RectVolSize};
diff --git a/world/src/sim/mod.rs b/world/src/sim/mod.rs
index 5dbe49791a..78a9f2c229 100644
--- a/world/src/sim/mod.rs
+++ b/world/src/sim/mod.rs
@@ -209,7 +209,7 @@ pub enum WorldFileError {
 #[derive(Serialize, Deserialize)]
 #[repr(u32)]
 pub enum WorldFile {
-    Veloren_0_5_0(WorldMap_0_5_0) = 0,
+    Veloren0_5_0(WorldMap_0_5_0) = 0,
 }
 
 /// Data for the most recent map type.  Update this when you add a new map verson.
@@ -268,15 +268,15 @@ impl WorldFile {
     /// using the latest map version.
 
     pub fn new(map: ModernMap) -> Self {
-        WorldFile::Veloren_0_5_0(map)
+        WorldFile::Veloren0_5_0(map)
     }
 
     #[inline]
     /// Turns a WorldFile into the latest version.  Whenever a new map version is added, just add
     /// it to this match statement.
-    pub fn into_modern(self) -> Result<ModernMap, (WorldFileError)> {
+    pub fn into_modern(self) -> Result<ModernMap, WorldFileError> {
         match self {
-            WorldFile::Veloren_0_5_0(map) => map.into_modern(),
+            WorldFile::Veloren0_5_0(map) => map.into_modern(),
         }
     }
 }
@@ -458,8 +458,8 @@ impl WorldSim {
         // a chunk isn't available).
         let n_approx = 1.0;
         let max_erosion_per_delta_t = /*8.0*//*32.0*//*1.0*//*32.0*//*32.0*//*16.0*//*64.0*//*32.0*/64.0/*128.0*//*1.0*//*0.2 * /*100.0*/250.0*//*128.0*//*16.0*//*128.0*//*32.0*/ * delta_t_scale(n_approx);
-        let erosion_pow_low = /*0.25*//*1.5*//*2.0*//*0.5*//*4.0*//*0.25*//*1.0*//*2.0*//*1.5*//*1.5*//*0.35*//*0.43*//*0.5*//*0.45*//*0.37*/1.002;
-        let erosion_pow_high = /*1.5*//*1.0*//*0.55*//*0.51*//*2.0*/1.002;
+        /* let erosion_pow_low = /*0.25*//*1.5*//*2.0*//*0.5*//*4.0*//*0.25*//*1.0*//*2.0*//*1.5*//*1.5*//*0.35*//*0.43*//*0.5*//*0.45*//*0.37*/1.002;
+        let erosion_pow_high = /*1.5*//*1.0*//*0.55*//*0.51*//*2.0*/1.002; */
         let erosion_center = /*0.45*//*0.75*//*0.75*//*0.5*//*0.75*/0.5;
         let n_steps = /*200*//*10_000*//*1000*//*50*//*100*/100; //100; // /*100*//*50*//*100*//*100*//*50*//*25*/25/*100*//*37*/;//150;//37/*100*/;//50;//50;//37;//50;//37; // /*37*//*29*//*40*//*150*/37; //150;//200;
         let n_small_steps = 0; //25;//8;//50;//50;//8;//8;//8;//8;//8; // 8
@@ -469,14 +469,14 @@ impl WorldSim {
         let logit = |x: f64| x.ln() - (-x).ln_1p();
         // 0.5 + 0.5 * tanh(ln(1 / (1 - 0.1) - 1) / (2 * (sqrt(3)/pi)))
         let logistic_2_base = 3.0f64.sqrt() * f64::consts::FRAC_2_PI;
-        let logistic_base = /*3.0f64.sqrt() * f64::consts::FRAC_1_PI*/1.0f64;
+        // let logistic_base = /*3.0f64.sqrt() * f64::consts::FRAC_1_PI*/1.0f64;
         // Assumes μ = 0, σ = 1
         let logistic_cdf = |x: f64| (x / logistic_2_base).tanh() * 0.5 + 0.5;
 
-        let exp_inverse_cdf = |x: f64/*, pow: f64*/| -(-x).ln_1p()/* / ln(pow)*/;
+        /* let exp_inverse_cdf = |x: f64/*, pow: f64*/| -(-x).ln_1p()/* / ln(pow)*/;
         // 2 / pi * ln(tan(pi/2 * p))
         let hypsec_inverse_cdf =
-            |x: f64| f64::consts::FRAC_2_PI * ((x * f64::consts::FRAC_PI_2).tan().ln());
+            |x: f64| f64::consts::FRAC_2_PI * ((x * f64::consts::FRAC_PI_2).tan().ln()); */
 
         let min_epsilon =
             1.0 / (WORLD_SIZE.x as f64 * WORLD_SIZE.y as f64).max(f64::EPSILON as f64 * 0.5);
@@ -708,9 +708,9 @@ impl WorldSim {
             if is_ocean_fn(posi) {
                 return 1.0;
             }
-            let wposf = (uniform_idx_as_vec2(posi) * TerrainChunkSize::RECT_SIZE.map(|e| e as i32))
-                .map(|e| e as f64);
-            let turb_wposf = wposf
+            /* let wposf = (uniform_idx_as_vec2(posi) * TerrainChunkSize::RECT_SIZE.map(|e| e as i32))
+            .map(|e| e as f64); */
+            /* let turb_wposf = wposf
                 .mul(5_000.0 / continent_scale)
                 .div(TerrainChunkSize::RECT_SIZE.map(|e| e as f64))
                 .div(turb_wposf_div);
@@ -720,21 +720,21 @@ impl WorldSim {
             ) * uplift_turb_scale
                 * TerrainChunkSize::RECT_SIZE.map(|e| e as f64);
             // let turb = Vec2::zero();
-            let turb_wposf = wposf + turb;
-            let turb_wposi = turb_wposf
+            let turb_wposf = wposf + turb; */
+            /* let turb_wposi = turb_wposf
                 .div(5_000.0 / continent_scale)
                 .map2(TerrainChunkSize::RECT_SIZE, |e, f| e / f as f64)
                 .map2(WORLD_SIZE, |e, f| (e as i32).max(f as i32 - 1).min(0));
-            let turb_posi = vec2_as_uniform_idx(turb_wposi);
-            let uheight = gen_ctx
-                .uplift_nz
-                .get(turb_wposf.into_array())
-                /* .min(0.5)
-                .max(-0.5)*/
-                .min(1.0)
-                .max(-1.0)
-                .mul(0.5)
-                .add(0.5);
+            let turb_posi = vec2_as_uniform_idx(turb_wposi); */
+            /* let uheight = gen_ctx
+            .uplift_nz
+            .get(turb_wposf.into_array())
+            /* .min(0.5)
+            .max(-0.5)*/
+            .min(1.0)
+            .max(-1.0)
+            .mul(0.5)
+            .add(0.5); */
             /* if uheight > 0.8 {
                 1.5
             } else {
@@ -749,7 +749,7 @@ impl WorldSim {
             alt_old[posi].1 * CONFIG.mountain_scale * height_scale(n_func(posi)) as f32
         };
 
-        let uplift_nz_dist = gen_ctx.uplift_nz.clone().enable_range(true);
+        // let uplift_nz_dist = gen_ctx.uplift_nz.clone().enable_range(true);
         // Recalculate altitudes without oceans.
         // NaNs in these uniform vectors wherever is_ocean_fn returns true.
         let (alt_old_no_ocean, alt_old_inverse) = uniform_noise(|posi, _| {
@@ -759,11 +759,11 @@ impl WorldSim {
                 Some(old_height(posi) /*.abs()*/)
             }
         });
-        let (uplift_uniform, _) = uniform_noise(|posi, wposf| {
+        let (uplift_uniform, _) = uniform_noise(|posi, _wposf| {
             if is_ocean_fn(posi) {
                 None
             } else {
-                let turb_wposf = wposf
+                /* let turb_wposf = wposf
                     .mul(5_000.0 / continent_scale)
                     .div(TerrainChunkSize::RECT_SIZE.map(|e| e as f64))
                     .div(turb_wposf_div);
@@ -773,13 +773,13 @@ impl WorldSim {
                 ) * uplift_turb_scale
                     * TerrainChunkSize::RECT_SIZE.map(|e| e as f64);
                 // let turb = Vec2::zero();
-                let turb_wposf = wposf + turb;
-                let turb_wposi = turb_wposf
+                let turb_wposf = wposf + turb; */
+                /* let turb_wposi = turb_wposf
                     .div(5_000.0 / continent_scale)
                     .map2(TerrainChunkSize::RECT_SIZE, |e, f| e / f as f64)
                     .map2(WORLD_SIZE, |e, f| (e as i32).max(f as i32 - 1).min(0));
-                let turb_posi = vec2_as_uniform_idx(turb_wposi);
-                let udist = uplift_nz_dist
+                let turb_posi = vec2_as_uniform_idx(turb_wposi); */
+                /* let udist = uplift_nz_dist
                     .get(turb_wposf.into_array())
                     .min(1.0)
                     .max(-1.0)
@@ -793,18 +793,18 @@ impl WorldSim {
                     .min(1.0)
                     .max(-1.0)
                     .mul(0.5)
-                    .add(0.5);
-                let uchaos = /* gen_ctx.chaos_nz.get((wposf.div(3_000.0)).into_array())
+                    .add(0.5); */
+                /* let uchaos = /* gen_ctx.chaos_nz.get((wposf.div(3_000.0)).into_array())
                         .min(1.0)
                         .max(-1.0)
                         .mul(0.5)
                         .add(0.5); */
                         chaos[posi].1;
 
-                let uchaos_1 = (uchaos as f64) / 1.32;
+                let uchaos_1 = (uchaos as f64) / 1.32; */
 
                 let oheight = /*alt_old*//*alt_base*/alt_old_no_ocean[/*(turb_posi / 64) * 64*/posi].0 as f64 - 0.5;
-                assert!(udist >= 0.0);
+                /* assert!(udist >= 0.0);
                 assert!(udist <= 1.0);
                 let uheight_1 = uheight; //.powf(2.0);
                 let udist_1 = (0.5 - udist).mul(2.0).max(0.0);
@@ -820,7 +820,7 @@ impl WorldSim {
                                 / 128.0
                                 / 128.0)),
                 );
-                let variation_1 = (uheight * /*udist_2*/udist_4).min(variation);
+                let variation_1 = (uheight * /*udist_2*/udist_4).min(variation); */
                 let height = (oheight + 0.5).powf(2.0);
                 // 1.0 - variation + variation * uchaos_1;
                 // uheight * /*udist_2*/udist_4 - variation_1 + variation_1 * uchaos_1;
@@ -846,16 +846,16 @@ impl WorldSim {
             }
         });
 
-        let old_height_uniform = |posi: usize| alt_old_no_ocean[posi].0;
+        // let old_height_uniform = |posi: usize| alt_old_no_ocean[posi].0;
         let alt_old_min_uniform = 0.0;
         let alt_old_max_uniform = 1.0;
-        let alt_old_center_uniform = erosion_center;
-        let (_alt_old_min_index, alt_old_min) = alt_old_inverse.first().unwrap();
-        let (_alt_old_max_index, alt_old_max) = alt_old_inverse.last().unwrap();
-        let (_alt_old_mid_index, alt_old_mid) =
+        //  let alt_old_center_uniform = erosion_center;
+        let (_alt_old_min_index, _alt_old_min) = alt_old_inverse.first().unwrap();
+        let (_alt_old_max_index, _alt_old_max) = alt_old_inverse.last().unwrap();
+        let (_alt_old_mid_index, _alt_old_mid) =
             alt_old_inverse[(alt_old_inverse.len() as f64 * erosion_center) as usize];
-        let alt_old_center =
-            ((alt_old_mid - alt_old_min) as f64 / (alt_old_max - alt_old_min) as f64);
+        /* let alt_old_center =
+        ((alt_old_mid - alt_old_min) as f64 / (alt_old_max - alt_old_min) as f64); */
 
         /* // Find the minimum and maximum original altitudes.
         // NOTE: Will panic if there is no land, and will not work properly if the minimum and
@@ -893,19 +893,19 @@ impl WorldSim {
         // let erosion_pow = 2.0;
         // let n_steps = 100;//150;
         // let erosion_factor = |x: f64| logistic_cdf(erosion_pow * logit(x));
-        let log_odds = |x: f64| {
+        /* let log_odds = |x: f64| {
             logit(x)
                 - logit(
                     /*erosion_center*/ alt_old_center_uniform, /*alt_old_center*/
                 )
-        };
+        }; */
         /* let erosion_factor = |x: f64| logistic_cdf(logistic_base * if x <= /*erosion_center*/alt_old_center_uniform/*alt_old_center*/ { erosion_pow_low.ln() } else { erosion_pow_high.ln() } * log_odds(x))/*0.5 + (x - 0.5).signum() * ((x - 0.5).mul(2.0).abs(
         ).powf(erosion_pow).mul(0.5))*/; */
         let erosion_factor = |x: f64| (/*if x <= /*erosion_center*/alt_old_center_uniform/*alt_old_center*/ { erosion_pow_low.ln() } else { erosion_pow_high.ln() } * */(/*exp_inverse_cdf*//*logit*/inv_func(x) - alt_exp_min_uniform) / (alt_exp_max_uniform - alt_exp_min_uniform))/*0.5 + (x - 0.5).signum() * ((x - 0.5).mul(2.0).abs(
 ).powf(erosion_pow).mul(0.5))*//*.powf(0.5)*//*.powf(1.5)*//*.powf(2.0)*/;
         let rock_strength_div_factor = /*8.0*/(2.0 * TerrainChunkSize::RECT_SIZE.x as f64) / 8.0;
         // let time_scale = 1.0; //4.0/*4.0*/;
-        let theta_func = |posi| 0.4;
+        let theta_func = |_posi| 0.4;
         let kf_func = {
             |posi| {
                 let kf_scale_i = k_fs_scale(theta_func(posi), n_func(posi)) as f64;
@@ -918,10 +918,10 @@ impl WorldSim {
                                                                  // return 2.0e-10;
                                                                  // return 0.0;
                 }
-                let wposf = (uniform_idx_as_vec2(posi)
+                /* let wposf = (uniform_idx_as_vec2(posi)
                     * TerrainChunkSize::RECT_SIZE.map(|e| e as i32))
-                .map(|e| e as f64);
-                let turb_wposf = wposf
+                .map(|e| e as f64); */
+                /* let turb_wposf = wposf
                     .mul(5_000.0 / continent_scale)
                     .div(TerrainChunkSize::RECT_SIZE.map(|e| e as f64))
                     .div(turb_wposf_div);
@@ -931,31 +931,31 @@ impl WorldSim {
                 ) * uplift_turb_scale
                     * TerrainChunkSize::RECT_SIZE.map(|e| e as f64);
                 // let turb = Vec2::zero();
-                let turb_wposf = wposf + turb;
-                let turb_wposi = turb_wposf
+                let turb_wposf = wposf + turb; */
+                /* let turb_wposi = turb_wposf
                     .div(5_000.0 / continent_scale)
                     .map2(TerrainChunkSize::RECT_SIZE, |e, f| e / f as f64)
                     .map2(WORLD_SIZE, |e, f| (e as i32).max(f as i32 - 1).min(0));
-                let turb_posi = vec2_as_uniform_idx(turb_wposi);
-                let uheight = gen_ctx
-                    .uplift_nz
-                    .get(turb_wposf.into_array())
-                    /* .min(0.5)
-                    .max(-0.5)*/
-                    .min(1.0)
-                    .max(-1.0)
-                    .mul(0.5)
-                    .add(0.5);
+                let turb_posi = vec2_as_uniform_idx(turb_wposi); */
+                /* let uheight = gen_ctx
+                .uplift_nz
+                .get(turb_wposf.into_array())
+                /* .min(0.5)
+                .max(-0.5)*/
+                .min(1.0)
+                .max(-1.0)
+                .mul(0.5)
+                .add(0.5); */
 
-                let uchaos = /* gen_ctx.chaos_nz.get((wposf.div(3_000.0)).into_array())
-                    .min(1.0)
-                    .max(-1.0)
-                    .mul(0.5)
-                    .add(0.5); */
-                    chaos[posi].1;
+                /* let uchaos = /* gen_ctx.chaos_nz.get((wposf.div(3_000.0)).into_array())
+                .min(1.0)
+                .max(-1.0)
+                .mul(0.5)
+                .add(0.5); */
+                chaos[posi].1; */
 
-                let oheight = /*alt_old*//*alt_base*/alt_old_no_ocean[/*(turb_posi / 64) * 64*/posi].0 as f64;
-                let oheight_2 = /*alt_old*//*alt_base*/(alt_old_no_ocean[/*(turb_posi / 64) * 64*/posi].1 as f64 / CONFIG.mountain_scale as f64);
+                /* let oheight = /*alt_old*//*alt_base*/alt_old_no_ocean[/*(turb_posi / 64) * 64*/posi].0 as f64;
+                let oheight_2 = /*alt_old*//*alt_base*/(alt_old_no_ocean[/*(turb_posi / 64) * 64*/posi].1 as f64 / CONFIG.mountain_scale as f64); */
 
                 let kf_i = // kf = 1.5e-4: high-high (plateau [fan sediment])
                 // kf = 1e-4: high (plateau)
@@ -1002,12 +1002,12 @@ impl WorldSim {
                         /*1.0e-2*/
                         1.0e-2 / 4.0
                     ;
-                    kd_i * kd_scale_i;
+                    return kd_i * kd_scale_i;
                 }
-                let wposf = (uniform_idx_as_vec2(posi)
+                /* let wposf = (uniform_idx_as_vec2(posi)
                     * TerrainChunkSize::RECT_SIZE.map(|e| e as i32))
-                .map(|e| e as f64);
-                let turb_wposf = wposf
+                .map(|e| e as f64); */
+                /* let turb_wposf = wposf
                     .mul(5_000.0 / continent_scale)
                     .div(TerrainChunkSize::RECT_SIZE.map(|e| e as f64))
                     .div(turb_wposf_div);
@@ -1017,27 +1017,27 @@ impl WorldSim {
                 ) * uplift_turb_scale
                     * TerrainChunkSize::RECT_SIZE.map(|e| e as f64);
                 // let turb = Vec2::zero();
-                let turb_wposf = wposf + turb;
-                let turb_wposi = turb_wposf
+                let turb_wposf = wposf + turb; */
+                /* let turb_wposi = turb_wposf
                     .div(5_000.0 / continent_scale)
                     .map2(TerrainChunkSize::RECT_SIZE, |e, f| e / f as f64)
                     .map2(WORLD_SIZE, |e, f| (e as i32).max(f as i32 - 1).min(0));
-                let turb_posi = vec2_as_uniform_idx(turb_wposi);
-                let uheight = gen_ctx
-                    .uplift_nz
-                    .get(turb_wposf.into_array())
-                    /* .min(0.5)
-                    .max(-0.5)*/
-                    .min(1.0)
-                    .max(-1.0)
-                    .mul(0.5)
-                    .add(0.5);
-                let uchaos = /* gen_ctx.chaos_nz.get((wposf.div(3_000.0)).into_array())
-                    .min(1.0)
-                    .max(-1.0)
-                    .mul(0.5)
-                    .add(0.5); */
-                    chaos[posi].1;
+                let turb_posi = vec2_as_uniform_idx(turb_wposi); */
+                /* let uheight = gen_ctx
+                .uplift_nz
+                .get(turb_wposf.into_array())
+                /* .min(0.5)
+                .max(-0.5)*/
+                .min(1.0)
+                .max(-1.0)
+                .mul(0.5)
+                .add(0.5); */
+                /* let uchaos = /* gen_ctx.chaos_nz.get((wposf.div(3_000.0)).into_array())
+                .min(1.0)
+                .max(-1.0)
+                .mul(0.5)
+                .add(0.5); */
+                chaos[posi].1; */
 
                 // kd = 1e-1: high (mountain, dike)
                 // kd = 1.5e-2: normal-high (plateau [fan sediment])
@@ -1045,7 +1045,7 @@ impl WorldSim {
                 // multiplied by height_scale² to account for change in area, then divided by
                 // time_scale to account for lower dt.
                 let kd_i = // 1.0e-2 * kd_scale_i;// m_old^2 / y * (1 m_new / 4 m_old)^2
-                    1.10e-2  / 4.0
+                    1.0e-2  / 4.0
                     // (uheight * (1.0e-1 - 1.0e-2) + 1.0e-2)
                     // ((1.0 - uheight) * (0.5 + 0.5 * ((1.32 - uchaos as f64) / 1.32)) * (1.0e-2 - 1.0e-3) + 1.0e-3)
                     // (uheight * (1.0e-2 - 1.0e-3) + 1.0e-3) / 2.0
@@ -1060,9 +1060,9 @@ impl WorldSim {
                 return 0.0;
                 // return 5.0;
             }
-            let wposf = (uniform_idx_as_vec2(posi) * TerrainChunkSize::RECT_SIZE.map(|e| e as i32))
-                .map(|e| e as f64);
-            let turb_wposf = wposf
+            /* let wposf = (uniform_idx_as_vec2(posi) * TerrainChunkSize::RECT_SIZE.map(|e| e as i32))
+            .map(|e| e as f64); */
+            /* let turb_wposf = wposf
                 .mul(5_000.0 / continent_scale)
                 .div(TerrainChunkSize::RECT_SIZE.map(|e| e as f64))
                 .div(turb_wposf_div);
@@ -1072,30 +1072,30 @@ impl WorldSim {
             ) * uplift_turb_scale
                 * TerrainChunkSize::RECT_SIZE.map(|e| e as f64);
             // let turb = Vec2::zero();
-            let turb_wposf = wposf + turb;
-            let turb_wposi = turb_wposf
+            let turb_wposf = wposf + turb; */
+            /* let turb_wposi = turb_wposf
                 .div(5_000.0 / continent_scale)
                 .map2(TerrainChunkSize::RECT_SIZE, |e, f| e / f as f64)
                 .map2(WORLD_SIZE, |e, f| (e as i32).max(f as i32 - 1).min(0));
-            let turb_posi = vec2_as_uniform_idx(turb_wposi);
-            let uheight = gen_ctx
-                .uplift_nz
-                .get(turb_wposf.into_array())
-                /* .min(0.5)
-                .max(-0.5)*/
-                .min(1.0)
-                .max(-1.0)
-                .mul(0.5)
-                .add(0.5);
+            let turb_posi = vec2_as_uniform_idx(turb_wposi); */
+            /* let uheight = gen_ctx
+            .uplift_nz
+            .get(turb_wposf.into_array())
+            /* .min(0.5)
+            .max(-0.5)*/
+            .min(1.0)
+            .max(-1.0)
+            .mul(0.5)
+            .add(0.5); */
 
-            let uchaos = /* gen_ctx.chaos_nz.get((wposf.div(3_000.0)).into_array())
+            /* let uchaos = /* gen_ctx.chaos_nz.get((wposf.div(3_000.0)).into_array())
                     .min(1.0)
                     .max(-1.0)
                     .mul(0.5)
                     .add(0.5); */
                     chaos[posi].1;
 
-            assert!(uchaos <= 1.32);
+            assert!(uchaos <= 1.32); */
 
             // G = d* v_s / p_0, where
             //  v_s is the settling velocity of sediment grains
@@ -1171,11 +1171,11 @@ impl WorldSim {
                 * TerrainChunkSize::RECT_SIZE.map(|e| e as f64);
             // let turb = Vec2::zero();
             let turb_wposf = wposf + turb;
-            let turb_wposi = turb_wposf
+            /* let turb_wposi = turb_wposf
                 .div(5_000.0 / continent_scale)
                 .map2(TerrainChunkSize::RECT_SIZE, |e, f| e / f as f64)
                 .map2(WORLD_SIZE, |e, f| (e as i32).max(f as i32 - 1).min(0));
-            let turb_posi = vec2_as_uniform_idx(turb_wposi);
+            let turb_posi = vec2_as_uniform_idx(turb_wposi); */
             let uheight = gen_ctx
                 .uplift_nz
                 .get(turb_wposf.into_array())
@@ -1221,7 +1221,6 @@ impl WorldSim {
             let epsilon_0_i =
                 // ((1.0 - ustrength) * (/*3.18e-4*/2.078e-3 - 5.3e-5) + 5.3e-5) as f32
                 ((1.0 - ustrength) * (/*3.18e-4*/2.078e-3 - 5.3e-5) + 5.3e-5) as f32 / 4.0
-            ;
             /* * time_scale*/
             // 0.0
             ;
@@ -1254,11 +1253,11 @@ impl WorldSim {
                 * TerrainChunkSize::RECT_SIZE.map(|e| e as f64);
             // let turb = Vec2::zero();
             let turb_wposf = wposf + turb;
-            let turb_wposi = turb_wposf
+            /* let turb_wposi = turb_wposf
                 .div(5_000.0 / continent_scale)
                 .map2(TerrainChunkSize::RECT_SIZE, |e, f| e / f as f64)
                 .map2(WORLD_SIZE, |e, f| (e as i32).max(f as i32 - 1).min(0));
-            let turb_posi = vec2_as_uniform_idx(turb_wposi);
+            let turb_posi = vec2_as_uniform_idx(turb_wposi); */
             let uheight = gen_ctx
                 .uplift_nz
                 .get(turb_wposf.into_array())
@@ -1309,7 +1308,7 @@ impl WorldSim {
                 .mul(max_erosion_per_delta_t) as f32; */
                 return 0.0;
             }
-            let wposf = (uniform_idx_as_vec2(posi) * TerrainChunkSize::RECT_SIZE.map(|e| e as i32))
+            /* let wposf = (uniform_idx_as_vec2(posi) * TerrainChunkSize::RECT_SIZE.map(|e| e as i32))
                 .map(|e| e as f64);
             let alt_main = {
                 // Extension upwards from the base.  A positive number from 0 to 1 curved to be
@@ -1337,10 +1336,10 @@ impl WorldSim {
                     .add(1.0)
                     .mul(0.4)/* + spring(alt_main.abs().powf(0.5).min(0.75).mul(60.0).sin(), 4.0)
                 .mul(0.045)*/)
-            };
+            }; */
             let height =
-                    ((/*old_height_uniform*/uplift_uniform[posi]./*0*/1 - alt_old_min_uniform) as f64
-                    / (alt_old_max_uniform - alt_old_min_uniform) as f64)
+                    (/*old_height_uniform*/uplift_uniform[posi]./*0*/1 - alt_old_min_uniform) as f64
+                    / (alt_old_max_uniform - alt_old_min_uniform) as f64
                     /*((old_height(posi) - alt_old_min) as f64
                     / (alt_old_max - alt_old_min) as f64)*/
                 ;
@@ -1386,7 +1385,8 @@ impl WorldSim {
             false {
                 (
                     /*(alt_main./*to_le_bytes()[7]*/to_bits() & 1) as f64*/
-                    (alt_main / CONFIG.mountain_scale as f64 * 128.0).mul(0.1).powf(1.2) * /*(1.0 / CONFIG.mountain_scale as f64)*/(f32::EPSILON * 0.5) as f64,
+                    /* (alt_main / CONFIG.mountain_scale as f64 * 128.0).mul(0.1).powf(1.2) * /*(1.0 / CONFIG.mountain_scale as f64)*/(f32::EPSILON * 0.5) as f64, */
+                    0.0,
                     (f32::EPSILON * 0.5) as f64,
                 )
             } else {
@@ -1398,7 +1398,7 @@ impl WorldSim {
             // tan(pi/6)*32 ~ 18
             // tan(54/360*2*pi)*32
             // let height = 1.0f64;
-            let turb_wposf = wposf
+            /* let turb_wposf = wposf
                 .mul(5_000.0 / continent_scale)
                 .div(TerrainChunkSize::RECT_SIZE.map(|e| e as f64))
                 .div(turb_wposf_div);
@@ -1416,7 +1416,7 @@ impl WorldSim {
                 .min(1.0)
                 .max(-1.0)
                 .mul(0.5)
-                .add(0.5);
+                .add(0.5); */
             // u = 1e-3: normal-high (dike, mountain)
             // u = 5e-4: normal (mid example in Yuan, average mountain uplift)
             // u = 2e-4: low (low example in Yuan; known that lagoons etc. may have u ~ 0.05).
@@ -1457,7 +1457,7 @@ impl WorldSim {
                 old_height(posi) // 0.0
             } else {
                 // uplift_fn(posi)
-                let wposf = (uniform_idx_as_vec2(posi)
+                /* let wposf = (uniform_idx_as_vec2(posi)
                     * TerrainChunkSize::RECT_SIZE.map(|e| e as i32))
                 .map(|e| e as f64);
                 let alt_main = {
@@ -1486,7 +1486,7 @@ impl WorldSim {
                         .add(1.0)
                         .mul(0.4)/* + spring(alt_main.abs().powf(0.5).min(0.75).mul(60.0).sin(), 4.0)
                     .mul(0.045)*/)
-                };
+                }; */
 
                 // (kf_func(posi) / 1.5e-4 * CONFIG.mountain_scale as f64) as f32
                 // (old_height_uniform(posi) as f64 * CONFIG.mountain_scale as f64) as f32
@@ -1611,7 +1611,6 @@ impl WorldSim {
             )
         } else {
             let (alt, basement /*, alluvium*/) = do_erosion(
-                0.0,
                 max_erosion_per_delta_t as f32,
                 n_steps,
                 &river_seed,
@@ -1647,7 +1646,6 @@ impl WorldSim {
 
             // Quick "small scale" erosion cycle in order to lower extreme angles.
             do_erosion(
-                0.0,
                 (1.0/* * height_scale*/) as f32,
                 n_small_steps,
                 &river_seed,
@@ -1716,7 +1714,6 @@ impl WorldSim {
             (alt, basement /*, alluvium*/)
         } else {
             do_erosion(
-                0.0,
                 (1.0/* * height_scale*/) as f32,
                 n_post_load_steps,
                 &river_seed,
@@ -2483,7 +2480,7 @@ impl SimChunk {
 
         // let height_scale = 1.0; // 1.0 / CONFIG.mountain_scale;
         let mut alt = CONFIG.sea_level.add(alt_pre /*.div(height_scale)*/);
-        let mut basement = CONFIG.sea_level.add(basement_pre /*.div(height_scale)*/);
+        let basement = CONFIG.sea_level.add(basement_pre /*.div(height_scale)*/);
         let water_alt = CONFIG.sea_level.add(water_alt_pre /*.div(height_scale)*/);
         let downhill = if downhill_pre == -2 {
             None
diff --git a/world/src/sim/util.rs b/world/src/sim/util.rs
index 65bf6886de..cdcdd84337 100644
--- a/world/src/sim/util.rs
+++ b/world/src/sim/util.rs
@@ -258,7 +258,7 @@ pub fn downhill<F: Float>(
     (0..WORLD_SIZE.x * WORLD_SIZE.y)
         .into_par_iter()
         // .enumerate()
-        .map(|(posi/*, &nh*/)| {
+        .map(|/*(*/ posi /*, &nh)*/| {
             let nh = h(posi);
             let _pos = uniform_idx_as_vec2(posi);
             if is_ocean(posi) {
diff --git a/world/src/util/structure.rs b/world/src/util/structure.rs
index e7c002dbbd..91b23690bf 100644
--- a/world/src/util/structure.rs
+++ b/world/src/util/structure.rs
@@ -1,5 +1,4 @@
 use super::{RandomField, Sampler};
-use crate::block::BlockGen;
 use rayon::prelude::*;
 use vek::*;