diff --git a/Cargo.lock b/Cargo.lock
index dd730fab..b605898b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3396,8 +3396,9 @@ dependencies = [
 
 [[package]]
 name = "tracy-client"
-version = "0.12.8"
-source = "git+https://github.com/nagisa/rust_tracy_client.git?branch=create-pull-request/patch#8be199c0fce3ae8df5c09dadc0c0b21be9b90ae2"
+version = "0.12.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dffcb26a0c786a0e154afdf21284969ff23759f42f156bcfddddae1a3c2404f2"
 dependencies = [
  "once_cell",
  "tracy-client-sys",
@@ -3405,8 +3406,9 @@ dependencies = [
 
 [[package]]
 name = "tracy-client-sys"
-version = "0.17.0"
-source = "git+https://github.com/nagisa/rust_tracy_client.git?branch=create-pull-request/patch#8be199c0fce3ae8df5c09dadc0c0b21be9b90ae2"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6226e4e77f0d46ce7ebb0a4b1daa82790035248b75bbf605b932a1d7b3b22b6d"
 dependencies = [
  "cc",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index af7036e3..ccbbc229 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ js-sys = "0.3"
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 console_log = { version = "0.2", features = ["color"] }
-tracing-wasm = { version = "0.2", optional = true }
+tracing-wasm = { version = "0.2", optional = true } # FIXME: Low quality dependency
 # stdweb variant is way faster!
 instant = { version = "0.1", features = ["stdweb"] } # FIXME: Untrusted dependency
 
@@ -58,7 +58,7 @@ reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"
 reqwest-middleware-cache = "0.1" # FIXME: Untrusted dependency
 reqwest-middleware = { version = "0.1" } # FIXME: Untrusted dependency
 tracing-tracy = { version = "0.8", optional = true }
-tracy-client = { git = "https://github.com/nagisa/rust_tracy_client.git", branch = "create-pull-request/patch", optional = true }
+tracy-client = { version = "0.12.7", optional = true }
 
 [target.'cfg(target_os = "android")'.dependencies]
 ndk-glue = "0.5.0" # version is required by winit
@@ -83,12 +83,6 @@ vector-tile = { path = "./libs/vector_tile" }
 style-spec = { path = "./libs/style_spec" }
 tilejson-spec = { path = "./libs/tilejson_spec" }
 
-# Math and geo
-# https://docs.rs/euclid/0.22.6/euclid/index.html
-#geo = "0.18.0"
-#geo-types = "0.7"
-# proj = "0.24" FIXME: Incompatible with wasm
-
 cgmath = "0.18"
 
 geo = { version = "0.19" }
@@ -112,9 +106,6 @@ bytemuck_derive = "1.0"
 
 include_dir = "0.7.2"
 
-[patch.crates-io]
-tracy-client = { git = "https://github.com/nagisa/rust_tracy_client.git", branch = "create-pull-request/patch", optional = true }
-
 [dev-dependencies]
 criterion = "0.3"
 # Support logging in tests
diff --git a/src/coords.rs b/src/coords.rs
index 54aa8979..172cb278 100644
--- a/src/coords.rs
+++ b/src/coords.rs
@@ -3,7 +3,6 @@
 use std::fmt;
 use std::fmt::Formatter;
 
-
 use cgmath::num_traits::Pow;
 use cgmath::{AbsDiffEq, Matrix4, Point3, Vector3};
 
diff --git a/src/input/mod.rs b/src/input/mod.rs
index d76550c3..246690fd 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -13,9 +13,6 @@ use crate::input::tilt_handler::TiltHandler;
 use crate::input::zoom_handler::ZoomHandler;
 use crate::map_state::MapState;
 
-
-
-
 mod pan_handler;
 mod pinch_handler;
 mod query_handler;
diff --git a/src/input/pan_handler.rs b/src/input/pan_handler.rs
index c7646cea..c0728a3c 100644
--- a/src/input/pan_handler.rs
+++ b/src/input/pan_handler.rs
@@ -3,7 +3,6 @@ use super::UpdateState;
 use crate::map_state::MapState;
 use crate::render::camera::Camera;
 
-
 use cgmath::{EuclideanSpace, Point3, Vector2, Vector3, Zero};
 use std::time::Duration;
 use winit::event::{ElementState, MouseButton};
diff --git a/src/input/pinch_handler.rs b/src/input/pinch_handler.rs
index 9d64c9d1..e7dbcef1 100644
--- a/src/input/pinch_handler.rs
+++ b/src/input/pinch_handler.rs
@@ -1,7 +1,6 @@
 use super::UpdateState;
 
-
-use crate::{MapState};
+use crate::MapState;
 use std::time::Duration;
 
 pub struct PinchHandler {}
diff --git a/src/input/query_handler.rs b/src/input/query_handler.rs
index b6abfe61..e89857be 100644
--- a/src/input/query_handler.rs
+++ b/src/input/query_handler.rs
@@ -1,6 +1,3 @@
-
-
-
 use cgmath::Vector2;
 
 use crate::coords::WorldCoords;
diff --git a/src/input/shift_handler.rs b/src/input/shift_handler.rs
index cc2ce3cf..6d8f40f3 100644
--- a/src/input/shift_handler.rs
+++ b/src/input/shift_handler.rs
@@ -1,7 +1,6 @@
 use super::UpdateState;
 
-
-use crate::{MapState};
+use crate::MapState;
 use cgmath::{Vector3, Zero};
 use std::time::Duration;
 
diff --git a/src/input/tilt_handler.rs b/src/input/tilt_handler.rs
index 58222784..81e65968 100644
--- a/src/input/tilt_handler.rs
+++ b/src/input/tilt_handler.rs
@@ -2,7 +2,6 @@ use super::UpdateState;
 
 use crate::map_state::MapState;
 
-
 use cgmath::{Deg, Rad, Zero};
 use std::time::Duration;
 
diff --git a/src/input/zoom_handler.rs b/src/input/zoom_handler.rs
index fae6c8cc..610cc13f 100644
--- a/src/input/zoom_handler.rs
+++ b/src/input/zoom_handler.rs
@@ -3,8 +3,6 @@ use super::UpdateState;
 use crate::coords::Zoom;
 use crate::map_state::MapState;
 
-
-
 use cgmath::{Vector2, Vector3};
 use std::time::Duration;
 
diff --git a/src/io/geometry_index.rs b/src/io/geometry_index.rs
index 33dce7cc..f91b328d 100644
--- a/src/io/geometry_index.rs
+++ b/src/io/geometry_index.rs
@@ -1,6 +1,6 @@
 use std::collections::{BTreeMap, HashMap};
 
-use cgmath::num_traits::{Signed};
+use cgmath::num_traits::Signed;
 use cgmath::Bounded;
 use geo::prelude::*;
 use geo_types::{CoordFloat, Coordinate, Geometry, LineString, Point, Polygon};
diff --git a/src/io/scheduler.rs b/src/io/scheduler.rs
index 20baabce..dd016d11 100644
--- a/src/io/scheduler.rs
+++ b/src/io/scheduler.rs
@@ -1,4 +1,4 @@
-use std::collections::{HashSet};
+use std::collections::HashSet;
 use std::future::Future;
 
 use geozero::mvt::Tile;
diff --git a/src/lib.rs b/src/lib.rs
index 9503496b..27fc5477 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,5 @@
 use crate::io::scheduler::Scheduler;
 
-
 mod input;
 
 pub(crate) mod coords;
@@ -17,7 +16,7 @@ pub(crate) mod winit;
 pub mod benchmarking;
 
 use crate::map_state::{MapState, Runnable};
-use crate::render::render_state::{RenderState};
+use crate::render::render_state::RenderState;
 pub use io::scheduler::ScheduleMethod;
 pub use platform::schedule_method::*;
 use style_spec::Style;
diff --git a/src/map_state.rs b/src/map_state.rs
index 3c01fbc4..eaff233a 100644
--- a/src/map_state.rs
+++ b/src/map_state.rs
@@ -6,10 +6,9 @@ use crate::render::camera;
 use crate::render::camera::{Camera, Perspective};
 use crate::render::render_state::RenderState;
 use crate::util::ChangeObserver;
-use crate::{WindowSize};
+use crate::WindowSize;
 use std::collections::HashSet;
 
-
 use style_spec::Style;
 use wgpu::SurfaceError;
 
diff --git a/src/platform/android/mod.rs b/src/platform/android/mod.rs
index 7c4ee846..1fe6c949 100644
--- a/src/platform/android/mod.rs
+++ b/src/platform/android/mod.rs
@@ -1,5 +1,6 @@
 use crate::io::scheduler::ScheduleMethod;
 use crate::platform::schedule_method::TokioScheduleMethod;
+use crate::FromWindow;
 use crate::MapBuilder;
 pub use std::time::Instant;
 
diff --git a/src/platform/apple/mod.rs b/src/platform/apple/mod.rs
index 0dd7a420..30bd6b9f 100644
--- a/src/platform/apple/mod.rs
+++ b/src/platform/apple/mod.rs
@@ -1,5 +1,6 @@
 use crate::io::scheduler::ScheduleMethod;
 use crate::platform::schedule_method::TokioScheduleMethod;
+use crate::FromWindow;
 use crate::MapBuilder;
 pub use std::time::Instant;
 
diff --git a/src/render/render_state.rs b/src/render/render_state.rs
index 8cad0d22..ee7746f8 100644
--- a/src/render/render_state.rs
+++ b/src/render/render_state.rs
@@ -1,7 +1,5 @@
-
 use std::default::Default;
 
-
 use std::{cmp, iter};
 
 use tracing;
@@ -13,7 +11,7 @@ use crate::coords::{ViewRegion, Zoom};
 
 use crate::io::tile_cache::TileCache;
 use crate::io::LayerTessellateMessage;
-use crate::platform::{MIN_BUFFER_SIZE};
+use crate::platform::MIN_BUFFER_SIZE;
 use crate::render::buffer_pool::{BackingBufferDescriptor, BufferPool, IndexEntry};
 
 use crate::render::camera::{Camera, ViewProjection};
@@ -23,7 +21,7 @@ use crate::render::options::{
 };
 use crate::render::tile_view_pattern::{TileInView, TileViewPattern};
 use crate::tessellation::IndexDataType;
-use crate::util::{FPSMeter};
+use crate::util::FPSMeter;
 use crate::WindowSize;
 
 use super::piplines::*;