diff --git a/Meshtastic/Views/Messages/ChannelList.swift b/Meshtastic/Views/Messages/ChannelList.swift
index ae1cc04d..39c0cff3 100644
--- a/Meshtastic/Views/Messages/ChannelList.swift
+++ b/Meshtastic/Views/Messages/ChannelList.swift
@@ -84,11 +84,9 @@ struct ChannelList: View {
 													.foregroundColor(.secondary)
 											}
 										}
-										#if targetEnvironment(macCatalyst)
-										Image(systemName: "chevron.forward")
-											.font(.caption)
-											.foregroundColor(.secondary)
-										#endif
+//										Image(systemName: "chevron.forward")
+//											.font(.caption)
+//											.foregroundColor(.secondary)
 									}
 									
 									if channel.allPrivateMessages.count > 0 {
@@ -146,6 +144,7 @@ struct ChannelList: View {
 					.padding([.top, .bottom])
 				}
 			}
+			.listStyle(.plain)
 			.navigationTitle("channels")
 		}
 	}
diff --git a/Meshtastic/Views/Messages/Messages.swift b/Meshtastic/Views/Messages/Messages.swift
index b818e5a9..1acbb673 100644
--- a/Meshtastic/Views/Messages/Messages.swift
+++ b/Meshtastic/Views/Messages/Messages.swift
@@ -13,17 +13,9 @@ struct Messages: View {
 	@Environment(\.managedObjectContext) var context
 	@EnvironmentObject var bleManager: BLEManager
 
-	@FetchRequest(
-		sortDescriptors: [NSSortDescriptor(key: "lastMessage", ascending: false), NSSortDescriptor(key: "longName", ascending: true)],
-		animation: .default)
-
-	private var users: FetchedResults<UserEntity>
 	@State var node: NodeInfoEntity?
 	@State private var userSelection: UserEntity? // Nothing selected by default.
 	@State private var channelSelection: ChannelEntity? // Nothing selected by default.
-	@State private var isPresentingDeleteChannelMessagesConfirm: Bool = false
-	@State private var isPresentingDeleteUserMessagesConfirm: Bool = false
-	@State private var isPresentingTraceRouteSentAlert = false
 	
 	@State private var columnVisibility = NavigationSplitViewVisibility.all
 	
diff --git a/Meshtastic/Views/Messages/UserList.swift b/Meshtastic/Views/Messages/UserList.swift
index 694cb3f7..fb612a5c 100644
--- a/Meshtastic/Views/Messages/UserList.swift
+++ b/Meshtastic/Views/Messages/UserList.swift
@@ -71,11 +71,9 @@ struct UserList: View {
 											.foregroundColor(.secondary)
 									}
 								}
-								#if targetEnvironment(macCatalyst)
-								Image(systemName: "chevron.forward")
-									.font(.caption)
-									.foregroundColor(.secondary)
-								#endif
+//								Image(systemName: "chevron.forward")
+//									.font(.caption)
+//									.foregroundColor(.secondary)
 							}
 							
 							if user.messageList.count > 0 {
@@ -141,6 +139,7 @@ struct UserList: View {
 				}
 			}
 		}
+		.listStyle(.plain)
 		.navigationTitle("contacts")
 	}
 }