diff --git a/src/api/client/report.rs b/src/api/client/report.rs
index 09da3d5f..dc4086a6 100644
--- a/src/api/client/report.rs
+++ b/src/api/client/report.rs
@@ -200,7 +200,7 @@ async fn is_event_report_valid(
 		 valid"
 	);
 
-	if room_id != &pdu.room_id_or_hash() {
+	if room_id != pdu.room_id_or_hash() {
 		return Err!(Request(NotFound("Event ID does not belong to the reported room",)));
 	}
 
diff --git a/src/api/client/room/create.rs b/src/api/client/room/create.rs
index 0b574864..9f0ad25d 100644
--- a/src/api/client/room/create.rs
+++ b/src/api/client/room/create.rs
@@ -91,7 +91,7 @@ pub(crate) async fn create_room_route(
 
 	// check if room ID doesn't already exist instead of erroring on auth check
 	if let Some(ref room_id) = room_id {
-		if services.rooms.short.get_shortroomid(&room_id).await.is_ok() {
+		if services.rooms.short.get_shortroomid(room_id).await.is_ok() {
 			return Err!(Request(RoomInUse("Room with that custom room ID already exists",)));
 		}
 	}
diff --git a/src/core/info/room_version.rs b/src/core/info/room_version.rs
index 5009e4fe..ae16ab85 100644
--- a/src/core/info/room_version.rs
+++ b/src/core/info/room_version.rs
@@ -17,12 +17,8 @@ pub const STABLE_ROOM_VERSIONS: &[RoomVersionId] = &[
 ];
 
 /// Experimental, partially supported room versions
-pub const UNSTABLE_ROOM_VERSIONS: &[RoomVersionId] = &[
-	RoomVersionId::V3,
-	RoomVersionId::V4,
-	RoomVersionId::V5,
-	RoomVersionId::V12,
-];
+pub const UNSTABLE_ROOM_VERSIONS: &[RoomVersionId] =
+	&[RoomVersionId::V3, RoomVersionId::V4, RoomVersionId::V5, RoomVersionId::V12];
 
 type RoomVersion = (RoomVersionId, RoomVersionStability);
 
diff --git a/src/core/matrix/state_res/mod.rs b/src/core/matrix/state_res/mod.rs
index de7a0c3a..4d8a9de6 100644
--- a/src/core/matrix/state_res/mod.rs
+++ b/src/core/matrix/state_res/mod.rs
@@ -289,11 +289,11 @@ where
 	let mut path: Vec<OwnedEventId> = Vec::new();
 	let mut seen: HashSet<OwnedEventId> = HashSet::new();
 	let next_event = |stack: &mut Vec<Vec<_>>, path: &mut Vec<_>| {
-		while stack.last().is_some_and(|s| s.is_empty()) {
+		while stack.last().is_some_and(std::vec::Vec::is_empty) {
 			stack.pop();
 			path.pop();
 		}
-		stack.last_mut().and_then(|s| s.pop())
+		stack.last_mut().and_then(std::vec::Vec::pop)
 	};
 	while let Some(event_id) = next_event(&mut stack, &mut path) {
 		path.push(event_id.clone());
diff --git a/src/service/rooms/event_handler/handle_incoming_pdu.rs b/src/service/rooms/event_handler/handle_incoming_pdu.rs
index b3358785..fab4d295 100644
--- a/src/service/rooms/event_handler/handle_incoming_pdu.rs
+++ b/src/service/rooms/event_handler/handle_incoming_pdu.rs
@@ -58,10 +58,8 @@ pub async fn handle_incoming_pdu<'a>(
 	value: BTreeMap<String, CanonicalJsonValue>,
 	is_timeline_event: bool,
 ) -> Result<Option<RawPduId>> {
-	if room_id.is_empty() {
-		// TODO(hydra): Room IDs should be calculated before this function is called
-		panic!("room ID cannot be empty");
-	}
+	// TODO(hydra): Room IDs should be calculated before this function is called
+	assert!(!room_id.is_empty(), "room ID cannot be empty");
 	// 1. Skip the PDU if we already have it as a timeline event
 	if let Ok(pdu_id) = self.services.timeline.get_pdu_id(event_id).await {
 		return Ok(Some(pdu_id));
diff --git a/src/service/rooms/state/mod.rs b/src/service/rooms/state/mod.rs
index 808d61b4..07d51dc0 100644
--- a/src/service/rooms/state/mod.rs
+++ b/src/service/rooms/state/mod.rs
@@ -16,7 +16,6 @@ use conduwuit_database::{Deserialized, Ignore, Interfix, Map};
 use futures::{
 	FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt, future::join_all, pin_mut,
 };
-use log::trace;
 use ruma::{
 	EventId, OwnedEventId, OwnedRoomId, RoomId, RoomVersionId, UserId,
 	events::{