diff --git a/common/net/src/sync/sync_ext.rs b/common/net/src/sync/sync_ext.rs
index e1b508a9ad..a84ea0bdd3 100644
--- a/common/net/src/sync/sync_ext.rs
+++ b/common/net/src/sync/sync_ext.rs
@@ -36,8 +36,6 @@ pub trait WorldSyncExt {
 impl WorldSyncExt for specs::World {
     fn register_sync_marker(&mut self) {
         self.register_synced::<Uid>();
-
-        // TODO: Consider only having allocator server side for now
         self.insert(UidAllocator::new());
     }
 
diff --git a/server-cli/src/main.rs b/server-cli/src/main.rs
index b2d3c043d1..902e010ef1 100644
--- a/server-cli/src/main.rs
+++ b/server-cli/src/main.rs
@@ -49,9 +49,9 @@ fn main() -> io::Result<()> {
     let _ = signal_hook::flag::register(signal_hook::consts::SIGUSR1, Arc::clone(&sigusr1_signal));
 
     let (_guards, _guards2) = if basic {
-        (vec![], common_frontend::init_stdout(None))
+        (Vec::new(), common_frontend::init_stdout(None))
     } else {
-        (common_frontend::init(None, &|| LOG.clone()), vec![])
+        (common_frontend::init(None, &|| LOG.clone()), Vec::new())
     };
 
     // Load settings
@@ -154,10 +154,6 @@ fn main() -> io::Result<()> {
 
     info!("Starting server...");
 
-    if no_auth {
-        server_settings.auth_server_address = None;
-    }
-
     let protocols_and_addresses = server_settings.gameserver_protocols.clone();
     let metrics_port = &server_settings.metrics_address.port();
     // Create server
@@ -170,17 +166,17 @@ fn main() -> io::Result<()> {
     )
     .expect("Failed to create server instance!");
 
-    let mut gameserver_addresses = vec![];
-    for protocol in protocols_and_addresses {
-        gameserver_addresses.push(match protocol {
+    // Collect addresses that the server is listening to log.
+    let gameserver_addresses = protocols_and_addresses
+        .into_iter()
+        .map(|protocol| match protocol {
             Protocol::Tcp { address } => ("TCP", address),
             Protocol::Quic {
                 address,
                 cert_file_path: _,
                 key_file_path: _,
             } => ("QUIC", address),
-        })
-    }
+        });
 
     info!(
         ?metrics_port,
diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs
index ea0e3c0ad7..cf2506fa0c 100644
--- a/voxygen/src/menu/main/ui/mod.rs
+++ b/voxygen/src/menu/main/ui/mod.rs
@@ -429,9 +429,9 @@ impl Controls {
                 }
             },
             Message::DeleteServer => {
-                events.push(Event::DeleteServer {
-                    server_index: self.selected_server_index.unwrap(),
-                });
+                if let Some(server_index) = self.selected_server_index {
+                    events.push(Event::DeleteServer { server_index });
+                }
             },
             /* Note: Keeping in case we re-add the disclaimer */
             /*Message::AcceptDisclaimer => {