diff --git a/crates/musicus/src/window.rs b/crates/musicus/src/window.rs
index bdd3f85..a9c8914 100644
--- a/crates/musicus/src/window.rs
+++ b/crates/musicus/src/window.rs
@@ -1,7 +1,7 @@
 use crate::config;
 use crate::import::SourceSelector;
 use crate::preferences::Preferences;
-use crate::screens::*;
+use crate::screens::{EnsembleScreen, PersonScreen, PlayerScreen};
 use crate::widgets::*;
 use crate::navigator::{Navigator, NavigatorWindow};
 use futures::prelude::*;
@@ -114,16 +114,6 @@ impl Window {
                 result.stack.set_visible_child_name("content");
             }));
 
-        // action!(
-        //     result.window,
-        //     "import-disc",
-        //     clone!(@strong result => move |_, _| {
-        //         let dialog = ImportDiscDialog::new(result.backend.clone());
-        //         let window = NavigatorWindow::new(dialog);
-        //         window.show();
-        //     })
-        // );
-
         action!(
             result.window,
             "preferences",
@@ -160,7 +150,7 @@ impl Window {
                         let player = clone.backend.get_player().unwrap();
 
                         player.set_raise_cb(clone!(@weak clone => move || {
-                            clone.window.present();
+                            clone.present();
                         }));
 
                         clone.player_bar.set_player(Some(player.clone()));
@@ -172,7 +162,7 @@ impl Window {
 
         let clone = result.clone();
         context.spawn_local(async move {
-            // This is not done in the async block below, because backend state changes may happen
+            // This is not done in the async block above, because backend state changes may happen
             // while this method is running.
             clone.backend.clone().init().await.unwrap();
         });
diff --git a/res/ui/window.ui b/res/ui/window.ui
index 433095f..22e1465 100644
--- a/res/ui/window.ui
+++ b/res/ui/window.ui
@@ -224,10 +224,6 @@
   </object>
   <menu id="menu">
     <section>
-    <item>
-        <attribute name="label" translatable="yes">Import CD</attribute>
-        <attribute name="action">win.import-disc</attribute>
-      </item>
       <item>
         <attribute name="label" translatable="yes">Preferences</attribute>
         <attribute name="action">win.preferences</attribute>