diff --git a/src/api/client/account/mod.rs b/src/api/client/account/mod.rs
index faa7290ae..8fe679a7c 100644
--- a/src/api/client/account/mod.rs
+++ b/src/api/client/account/mod.rs
@@ -367,7 +367,7 @@ pub async fn full_user_deactivate(
 		let room_power_levels = services
 			.rooms
 			.state_accessor
-			.get_room_power_levels(&room_id)
+			.get_room_power_levels(room_id)
 			.await;
 
 		let user_can_demote_self =
@@ -394,7 +394,7 @@ pub async fn full_user_deactivate(
 		// TODO: Redact all messages sent by the user in the room
 	}
 
-	for (pdu, room_id) in pdu_queue.into_iter() {
+	for (pdu, room_id) in pdu_queue {
 		let state_lock = services.rooms.state.mutex.lock(room_id.as_str()).await;
 
 		let _ = services
diff --git a/src/api/router/args.rs b/src/api/router/args.rs
index a2510bd16..26927504b 100644
--- a/src/api/router/args.rs
+++ b/src/api/router/args.rs
@@ -17,7 +17,6 @@
 /// Query parameters needed to authenticate requests
 #[derive(Deserialize)]
 pub(super) struct AuthQueryParams {
-	pub(super) access_token: Option<String>,
 	pub(super) user_id: Option<String>,
 	/// Device ID for appservice device masquerading (MSC3202/MSC4190).
 	/// Can be provided as `device_id` or `org.matrix.msc3202.device_id`.
diff --git a/src/api/router/auth.rs b/src/api/router/auth.rs
index 809ddd2df..48ee031f2 100644
--- a/src/api/router/auth.rs
+++ b/src/api/router/auth.rs
@@ -19,13 +19,6 @@
 
 use crate::{router::args::AuthQueryParams, service::appservice::RegistrationInfo};
 
-enum Token {
-	Appservice(Box<RegistrationInfo>),
-	User((OwnedUserId, OwnedDeviceId)),
-	Invalid,
-	None,
-}
-
 #[derive(Default)]
 pub(super) struct Auth {
 	pub(super) origin: Option<OwnedServerName>,