diff --git a/lib/mks-display-picture.c b/lib/mks-display-picture.c
index 8486343..0fecd16 100644
--- a/lib/mks-display-picture.c
+++ b/lib/mks-display-picture.c
@@ -456,7 +456,7 @@ mks_display_picture_measure (GtkWidget      *widget,
 {
   MksDisplayPicture *self = (MksDisplayPicture *)widget;
   GdkPaintable *paintable;
-  double min_width, min_height, nat_width, nat_height;
+  double nat_width, nat_height;
   int default_width;
   int default_height;
 
@@ -480,11 +480,6 @@ mks_display_picture_measure (GtkWidget      *widget,
   if (default_height <= 0)
     default_height = 480;
 
-  gdk_paintable_compute_concrete_size (paintable,
-                                       0, 0,
-                                       default_width, default_height,
-                                       &min_width, &min_height);
-
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
     {
       gdk_paintable_compute_concrete_size (paintable,
diff --git a/lib/mks-display.c b/lib/mks-display.c
index 9bde48c..b77e660 100644
--- a/lib/mks-display.c
+++ b/lib/mks-display.c
@@ -185,8 +185,7 @@ mks_display_legacy_event_cb (MksDisplay               *self,
   if (priv->screen == NULL)
     return GDK_EVENT_PROPAGATE;
 
-  if (FALSE) {}
-  else if (event_type == GDK_BUTTON_PRESS)
+  if (event_type == GDK_BUTTON_PRESS)
     {
       if (priv->inhibitor == NULL)
         {
diff --git a/lib/mks-keyboard.c b/lib/mks-keyboard.c
index 9bc65b9..0b0362f 100644
--- a/lib/mks-keyboard.c
+++ b/lib/mks-keyboard.c
@@ -62,8 +62,7 @@ mks_keyboard_keyboard_notify_cb (MksKeyboard     *self,
   g_assert (pspec != NULL);
   g_assert (MKS_QEMU_IS_KEYBOARD (keyboard));
 
-  if (FALSE) {}
-  else if (strcmp (pspec->name, "modifiers") == 0)
+  if (strcmp (pspec->name, "modifiers") == 0)
     {
       self->modifiers = mks_qemu_keyboard_get_modifiers (keyboard);
       g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_MODIFIERS]);