diff --git a/src/device/cart.rs b/src/device/cart.rs
index 97bf09f..ba3d23d 100644
--- a/src/device/cart.rs
+++ b/src/device/cart.rs
@@ -21,16 +21,6 @@ const JDT_EEPROM_16K: u16 = 0xc000; /* 16k EEPROM */
 const EEPROM_BLOCK_SIZE: usize = 8;
 pub const EEPROM_MAX_SIZE: usize = 0x800;
 
-#[derive(serde::Serialize, serde::Deserialize)]
-pub enum CicType {
-    CicNus6101,
-    CicNus6102,
-    CicNus6103,
-    CicNus6105,
-    CicNus6106,
-    CicNus5167,
-}
-
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct AfRtc {
     pub control: u16,
diff --git a/src/ui/netplay.rs b/src/ui/netplay.rs
index b604cfd..c331c50 100644
--- a/src/ui/netplay.rs
+++ b/src/ui/netplay.rs
@@ -523,50 +523,44 @@ fn update_sessions(weak: slint::Weak<NetplayJoin>) {
                             .await
                             .unwrap();
 
-                        if let Some(Ok(response)) = read.next().await {
-                            if let Ok(message) =
+                        if let Some(Ok(response)) = read.next().await
+                            && let Ok(message) =
                                 serde_json::from_slice::<NetplayMessage>(&response.into_data())
-                            {
-                                if message.message_type == "reply_get_rooms"
-                                    && message.accept.unwrap() == 0
-                                    && let Some(rooms) = message.rooms
-                                {
-                                    for room in rooms {
-                                        let mut session = vec![];
-                                        room_urls.push(server_url.into());
+                            && message.message_type == "reply_get_rooms"
+                            && message.accept.unwrap() == 0
+                            && let Some(rooms) = message.rooms
+                        {
+                            for room in rooms {
+                                let mut session = vec![];
+                                room_urls.push(server_url.into());
 
-                                        session.push(slint::StandardListViewItem::from(
-                                            slint::SharedString::from(server_name),
-                                        ));
-                                        session.push(slint::StandardListViewItem::from(
-                                            slint::SharedString::from(room.room_name.unwrap()),
-                                        ));
-                                        session.push(slint::StandardListViewItem::from(
-                                            slint::SharedString::from(room.game_name.unwrap()),
-                                        ));
-                                        session.push(slint::StandardListViewItem::from(
-                                            slint::SharedString::from(if room.protected.unwrap() {
-                                                "True"
-                                            } else {
-                                                "False"
-                                            }),
-                                        ));
-                                        session.push(slint::StandardListViewItem::from(
-                                            slint::SharedString::from(
-                                                if room
-                                                    .features
-                                                    .unwrap_or_default()
-                                                    .contains_key("cheats")
-                                                {
-                                                    "True"
-                                                } else {
-                                                    "False"
-                                                },
-                                            ),
-                                        ));
-                                        sessions.push(session);
-                                    }
-                                }
+                                session.push(slint::StandardListViewItem::from(
+                                    slint::SharedString::from(server_name),
+                                ));
+                                session.push(slint::StandardListViewItem::from(
+                                    slint::SharedString::from(room.room_name.unwrap()),
+                                ));
+                                session.push(slint::StandardListViewItem::from(
+                                    slint::SharedString::from(room.game_name.unwrap()),
+                                ));
+                                session.push(slint::StandardListViewItem::from(
+                                    slint::SharedString::from(if room.protected.unwrap() {
+                                        "True"
+                                    } else {
+                                        "False"
+                                    }),
+                                ));
+                                session.push(slint::StandardListViewItem::from(
+                                    slint::SharedString::from(
+                                        if room.features.unwrap_or_default().contains_key("cheats")
+                                        {
+                                            "True"
+                                        } else {
+                                            "False"
+                                        },
+                                    ),
+                                ));
+                                sessions.push(session);
                             }
                         }
                     }