diff --git a/Cargo.lock b/Cargo.lock
index 7cf7f85d..d7819764 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1581,12 +1581,6 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
 [[package]]
 name = "memchr"
 version = "2.3.4"
@@ -2637,12 +2631,10 @@ dependencies = [
  "linkify",
  "log",
  "many-to-many",
- "md5",
  "mongodb",
  "nanoid 0.4.0",
  "num_enum",
  "once_cell",
- "rand 0.7.3",
  "rauth",
  "regex",
  "reqwest",
@@ -2651,9 +2643,7 @@ dependencies = [
  "rocket_cors",
  "serde",
  "serde_json",
- "time 0.2.25",
  "ulid",
- "urlencoding",
  "validator",
  "web-push",
 ]
@@ -3745,12 +3735,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "urlencoding"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9232eb53352b4442e40d7900465dfc534e8cb2dc8f18656fcb2ac16112b5593"
-
 [[package]]
 name = "utf-8"
 version = "0.7.5"
diff --git a/Cargo.toml b/Cargo.toml
index afb7fc4b..77cc09d3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,38 +10,47 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-regex = "1"
-md5 = "0.7.0"
+# Utility
 log = "0.4.11"
-ulid = "0.4.1"
-rand = "0.7.3"
-time = "0.2.16"
-nanoid = "0.4.0"
-base64 = "0.13.0"
-linkify = "0.6.0"
 dotenv = "0.15.0"
-futures = "0.3.8"
-chrono = "0.4.15"
+linkify = "0.6.0"
+once_cell = "1.4.1"
+env_logger = "0.7.1"
+lazy_static = "1.4.0"
+ctrlc = { version = "3.0", features = ["termination"] }
+
+# Lang. Utilities
+regex = "1"
 num_enum = "0.5.1"
 impl_ops = "0.1.1"
-web-push = "0.7.2"
-once_cell = "1.4.1"
 bitfield = "0.13.2"
-env_logger = "0.7.1"
+
+# ID / key generation
+ulid = "0.4.1"
+nanoid = "0.4.0"
+base64 = "0.13.0"
+
+# serde
 serde_json = "1.0.57"
-lazy_static = "1.4.0"
-urlencoding = "1.1.1"
-many-to-many = "0.1.2"
-lettre = "0.10.0-alpha.4"
-reqwest = { version = "0.10.8", features = ["json"] }
 serde = { version = "1.0.115", features = ["derive"] }
 validator = { version = "0.11", features = ["derive"] }
-ctrlc = { version = "3.0", features = ["termination"] }
+
+# async
+futures = "0.3.8"
+chrono = "0.4.15"
+reqwest = { version = "0.10.8", features = ["json"] }
+async-std = { version = "1.8.0", features = ["tokio1", "tokio02", "attributes"] }
+
+# internal util
+web-push = "0.7.2"
+many-to-many = "0.1.2"
+lettre = "0.10.0-alpha.4"
+rauth = { git = "https://gitlab.insrt.uk/insert/rauth", rev = "840ad003263fd5570aba4866e7d72e4fc1b3e95a" }
+hive_pubsub = { git = "https://gitlab.insrt.uk/insert/hive", rev = "a89826df2b30166220e68a6ed01a58b751456604", features = ["mongo"] }
+
+# web
 rocket-governor = { version = "0.0.1-rc.9", features = ["logger"] }
 async-tungstenite = { version = "0.10.0", features = ["async-std-runtime"] }
-async-std = { version = "1.8.0", features = ["tokio1", "tokio02", "attributes"] }
 rocket = { version = "0.5.0-rc.1", default-features = false, features = ["json"] }
 mongodb = { version = "1.2.2", features = ["tokio-runtime"], default-features = false }
-rauth = { git = "https://gitlab.insrt.uk/insert/rauth", rev = "840ad003263fd5570aba4866e7d72e4fc1b3e95a" }
 rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "5843861a88958c16bfaa0b40f0d8910772bcd2f6" }
-hive_pubsub = { git = "https://gitlab.insrt.uk/insert/hive", rev = "a89826df2b30166220e68a6ed01a58b751456604", features = ["mongo"] }
diff --git a/src/util/ratelimit.rs b/src/util/ratelimit.rs
index 576aa833..28e95956 100644
--- a/src/util/ratelimit.rs
+++ b/src/util/ratelimit.rs
@@ -1,5 +1,3 @@
-use std::time::Duration;
-
 use rocket_governor::{Method, Quota, RocketGovernable};
 
 pub struct RateLimitGuard;