diff --git a/Cargo.lock b/Cargo.lock
index 8fd09e49e2..8f440b908e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -478,16 +478,6 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
-[[package]]
-name = "cgl"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55e7ec0b74fe5897894cbc207092c577e87c52f8a59e8ca8d97ef37551f60a49"
-dependencies = [
- "gleam",
- "libc",
-]
-
 [[package]]
 name = "cgl"
 version = "0.3.2"
@@ -554,21 +544,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "cocoa"
-version = "0.18.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1706996401131526e36b3b49f0c4d912639ce110996f3ca144d78946727bce54"
-dependencies = [
- "bitflags",
- "block",
- "core-foundation 0.6.4",
- "core-graphics 0.17.3",
- "foreign-types",
- "libc",
- "objc",
-]
-
 [[package]]
 name = "cocoa"
 version = "0.19.1"
@@ -704,7 +679,7 @@ dependencies = [
  "objc-foundation",
  "objc_id",
  "smithay-clipboard",
- "wayland-client 0.23.6",
+ "wayland-client",
  "x11-clipboard",
 ]
 
@@ -1604,17 +1579,6 @@ dependencies = [
  "gl_generator 0.14.0",
 ]
 
-[[package]]
-name = "gfx_window_glutin"
-version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310ff66f08b5a55854b18fea2f48bdbb75c94458207ba574c9723be78e97a646"
-dependencies = [
- "gfx_core",
- "gfx_device_gl",
- "glutin 0.21.2",
-]
-
 [[package]]
 name = "gilrs"
 version = "0.7.4"
@@ -1720,15 +1684,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "gleam"
-version = "0.6.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5"
-dependencies = [
- "gl_generator 0.13.1",
-]
-
 [[package]]
 name = "glib"
 version = "0.5.0"
@@ -1769,32 +1724,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "glutin"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5371b35b309dace06be1b81b5f6adb1c9de578b7dbe1e74bf7e4ef762cf6febd"
-dependencies = [
- "android_glue",
- "cgl 0.2.3",
- "cocoa 0.18.5",
- "core-foundation 0.6.4",
- "core-graphics 0.17.3",
- "glutin_egl_sys",
- "glutin_emscripten_sys",
- "glutin_gles2_sys",
- "glutin_glx_sys",
- "glutin_wgl_sys",
- "lazy_static",
- "libloading 0.5.2",
- "objc",
- "osmesa-sys",
- "parking_lot 0.9.0",
- "wayland-client 0.21.13",
- "winapi 0.3.8",
- "winit 0.19.5",
-]
-
 [[package]]
 name = "glutin"
 version = "0.24.1"
@@ -1802,7 +1731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a9666c8fd9afd008f6559e2468c35e11aad1d110d525bb3b354e4138ec0e20f"
 dependencies = [
  "android_glue",
- "cgl 0.3.2",
+ "cgl",
  "cocoa 0.20.2",
  "core-foundation 0.7.0",
  "core-graphics 0.19.2",
@@ -1817,9 +1746,9 @@ dependencies = [
  "objc",
  "osmesa-sys",
  "parking_lot 0.10.2",
- "wayland-client 0.23.6",
+ "wayland-client",
  "winapi 0.3.8",
- "winit 0.22.2",
+ "winit",
 ]
 
 [[package]]
@@ -2875,7 +2804,7 @@ checksum = "a0557cea37cc48d238c938ded2873a6cc772704ee1eb01e832b43c2dd99624bc"
 dependencies = [
  "gfx_core",
  "gfx_device_gl",
- "glutin 0.24.1",
+ "glutin",
 ]
 
 [[package]]
@@ -3876,23 +3805,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"
 
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ccb8c57049b2a34d2cc2b203fa785020ba0129d31920ef0d317430adaf748fa"
-dependencies = [
- "andrew",
- "bitflags",
- "dlib",
- "lazy_static",
- "memmap",
- "nix 0.14.1",
- "wayland-client 0.21.13",
- "wayland-commons 0.21.13",
- "wayland-protocols 0.21.13",
-]
-
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.6.6"
@@ -3905,8 +3817,8 @@ dependencies = [
  "lazy_static",
  "memmap",
  "nix 0.14.1",
- "wayland-client 0.23.6",
- "wayland-protocols 0.23.6",
+ "wayland-client",
+ "wayland-protocols",
 ]
 
 [[package]]
@@ -3916,7 +3828,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "917e8ec7f535cd1a6cbf749c8866c24d67c548a80ac48c8e88a182eab5c07bd1"
 dependencies = [
  "nix 0.14.1",
- "smithay-client-toolkit 0.6.6",
+ "smithay-client-toolkit",
 ]
 
 [[package]]
@@ -4717,11 +4629,10 @@ dependencies = [
  "failure",
  "gfx",
  "gfx_device_gl",
- "gfx_window_glutin",
  "gilrs",
  "git2",
  "glsl-include",
- "glutin 0.24.1",
+ "glutin",
  "guillotiere",
  "hashbrown",
  "image",
@@ -4747,7 +4658,7 @@ dependencies = [
  "veloren-server",
  "veloren-voxygen-anim",
  "veloren-world",
- "winit 0.22.2",
+ "winit",
  "winres",
 ]
 
@@ -4912,21 +4823,6 @@ version = "0.2.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9ba19973a58daf4db6f352eda73dc0e289493cd29fb2632eb172085b6521acd"
 
-[[package]]
-name = "wayland-client"
-version = "0.21.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49963e5f9eeaf637bfcd1b9f0701c99fd5cd05225eb51035550d4272806f2713"
-dependencies = [
- "bitflags",
- "downcast-rs",
- "libc",
- "nix 0.14.1",
- "wayland-commons 0.21.13",
- "wayland-scanner 0.21.13",
- "wayland-sys 0.21.13",
-]
-
 [[package]]
 name = "wayland-client"
 version = "0.23.6"
@@ -4939,19 +4835,9 @@ dependencies = [
  "libc",
  "mio",
  "nix 0.14.1",
- "wayland-commons 0.23.6",
- "wayland-scanner 0.23.6",
- "wayland-sys 0.23.6",
-]
-
-[[package]]
-name = "wayland-commons"
-version = "0.21.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40c08896768b667e1df195d88a62a53a2d1351a1ed96188be79c196b35bb32ec"
-dependencies = [
- "nix 0.14.1",
- "wayland-sys 0.21.13",
+ "wayland-commons",
+ "wayland-scanner",
+ "wayland-sys",
 ]
 
 [[package]]
@@ -4961,20 +4847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb"
 dependencies = [
  "nix 0.14.1",
- "wayland-sys 0.23.6",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.21.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afde2ea2a428eee6d7d2c8584fdbe8b82eee8b6c353e129a434cd6e07f42145"
-dependencies = [
- "bitflags",
- "wayland-client 0.21.13",
- "wayland-commons 0.21.13",
- "wayland-scanner 0.21.13",
- "wayland-sys 0.21.13",
+ "wayland-sys",
 ]
 
 [[package]]
@@ -4984,20 +4857,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9"
 dependencies = [
  "bitflags",
- "wayland-client 0.23.6",
- "wayland-commons 0.23.6",
- "wayland-scanner 0.23.6",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.21.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf3828c568714507315ee425a9529edc4a4aa9901409e373e9e0027e7622b79e"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "xml-rs",
+ "wayland-client",
+ "wayland-commons",
+ "wayland-scanner",
 ]
 
 [[package]]
@@ -5011,16 +4873,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "wayland-sys"
-version = "0.21.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520ab0fd578017a0ee2206623ba9ef4afe5e8f23ca7b42f6acfba2f4e66b1628"
-dependencies = [
- "dlib",
- "lazy_static",
-]
-
 [[package]]
 name = "wayland-sys"
 version = "0.23.6"
@@ -5103,31 +4955,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "winit"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e96eb4bb472fa43e718e8fa4aef82f86cd9deac9483a1e1529230babdb394a8"
-dependencies = [
- "android_glue",
- "backtrace",
- "bitflags",
- "cocoa 0.18.5",
- "core-foundation 0.6.4",
- "core-graphics 0.17.3",
- "lazy_static",
- "libc",
- "log",
- "objc",
- "parking_lot 0.9.0",
- "percent-encoding 2.1.0",
- "raw-window-handle",
- "smithay-client-toolkit 0.4.6",
- "wayland-client 0.21.13",
- "winapi 0.3.8",
- "x11-dl",
-]
-
 [[package]]
 name = "winit"
 version = "0.22.2"
@@ -5153,8 +4980,8 @@ dependencies = [
  "percent-encoding 2.1.0",
  "raw-window-handle",
  "serde",
- "smithay-client-toolkit 0.6.6",
- "wayland-client 0.23.6",
+ "smithay-client-toolkit",
+ "wayland-client",
  "winapi 0.3.8",
  "x11-dl",
 ]
diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index d0cf1c1234..7576819aed 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -87,7 +87,6 @@ winres = "0.1"
 criterion = "0.3"
 git2 = "0.13"
 world = { package = "veloren-world", path = "../world" }
-gfx_window_glutin = { version = "0.31.0", features = ["headless"] }
 
 [[bench]]
 name = "meshing_benchmark"
diff --git a/voxygen/examples/character_renderer.rs b/voxygen/examples/character_renderer.rs
index cf0aee4f53..a6d46d9b3c 100644
--- a/voxygen/examples/character_renderer.rs
+++ b/voxygen/examples/character_renderer.rs
@@ -1,9 +1,16 @@
-use common::comp;
+// TODO: fix this example when we switch to actively maintained renderering
+// backend Right now we would have to update `gfx_window_glutin` to work with
+// the latest version of glutin or we would need to add headless support to
+// `old_school_gfx_glutin_ext`
+
+fn main() {
+    println!("Example temporarily disabled, see the TODO comment for details");
+}
+/*use common::comp;
 use gfx_window_glutin::init_headless;
 use vek::*;
 use veloren_voxygen::{render, scene::simple as scene};
 
-#[allow(clippy::clone_on_copy)] // TODO: Pending review in #587
 fn main() {
     // Setup renderer
     let dim = (200u16, 300u16, 1, gfx::texture::AaMode::Single);
@@ -72,4 +79,4 @@ fn main() {
     // Get image
     let img = renderer.create_screenshot().unwrap();
     img.save("character.png").unwrap();
-}
+}*/
diff --git a/voxygen/examples/voxygen - Shortcut.lnk b/voxygen/examples/voxygen - Shortcut.lnk
deleted file mode 100644
index 722dd67f2a..0000000000
Binary files a/voxygen/examples/voxygen - Shortcut.lnk and /dev/null differ