diff --git a/present/present_screen.c b/present/present_screen.c
index bfd30b8ba08b04e88d8857907e339ab53a40738f..6efe3b3a2c3222cf09fd85db251189d4a525fbed 100644
--- a/present/present_screen.c
+++ b/present/present_screen.c
@@ -64,7 +64,8 @@ present_close_screen(ScreenPtr screen)
 {
     present_screen_priv_ptr screen_priv = present_screen_priv(screen);
 
-    screen_priv->flip_destroy(screen);
+    if (screen_priv->flip_destroy)
+        screen_priv->flip_destroy(screen);
 
     unwrap(screen_priv, screen, CloseScreen);
     (*screen->CloseScreen) (screen);
diff --git a/present/present_wnmd.c b/present/present_wnmd.c
index 97b8fe00c1ea1a249872c102f493d275a8616ff9..3f78f02a04b59d0d299038b967727e2e3246015a 100644
--- a/present/present_wnmd.c
+++ b/present/present_wnmd.c
@@ -413,34 +413,6 @@ present_wnmd_cancel_flip(WindowPtr window)
         present_wnmd_flips_stop(window);
 }
 
-static Bool
-present_wnmd_can_window_flip(WindowPtr window)
-{
-    ScreenPtr                   screen = window->drawable.pScreen;
-    present_screen_priv_ptr     screen_priv = present_screen_priv(screen);
-    WindowPtr                   toplvl_window = present_wnmd_toplvl_pixmap_window(window);
-
-    if (!screen_priv)
-        return FALSE;
-
-    if (!screen_priv->wnmd_info)
-        return FALSE;
-
-    /* Check to see if the driver supports flips at all */
-    if (!screen_priv->wnmd_info->flip)
-        return FALSE;
-
-    /* Don't flip redirected windows */
-    if (window->redirectDraw != RedirectDrawNone)
-        return FALSE;
-
-    /* Window must be same region as toplevel window */
-    if ( !RegionEqual(&window->winSize, &toplvl_window->winSize) )
-        return FALSE;
-
-    return TRUE;
-}
-
 /*
  * Once the required MSC has been reached, execute the pending request.
  *
@@ -702,12 +674,6 @@ present_wnmd_abort_vblank(ScreenPtr screen, WindowPtr window, RRCrtcPtr crtc, ui
     }
 }
 
-static void
-present_wnmd_flip_destroy(ScreenPtr screen)
-{
-    /* Cleanup done on window destruction */
-}
-
 static void
 present_wnmd_flush(WindowPtr window)
 {
@@ -725,7 +691,6 @@ present_wnmd_init_mode_hooks(present_screen_priv_ptr screen_priv)
 
     screen_priv->check_flip         =   &present_wnmd_check_flip;
     screen_priv->check_flip_window  =   &present_wnmd_check_flip_window;
-    screen_priv->can_window_flip    =   &present_wnmd_can_window_flip;
 
     screen_priv->present_pixmap     =   &present_wnmd_pixmap;
     screen_priv->create_event_id    =   &present_wnmd_create_event_id;
@@ -734,5 +699,4 @@ present_wnmd_init_mode_hooks(present_screen_priv_ptr screen_priv)
     screen_priv->re_execute         =   &present_wnmd_re_execute;
 
     screen_priv->abort_vblank       =   &present_wnmd_abort_vblank;
-    screen_priv->flip_destroy       =   &present_wnmd_flip_destroy;
 }