diff --git a/dix/events.c b/dix/events.c
index c519932e8..499a2acd9 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2385,13 +2385,6 @@ NewCurrentScreen(ScreenPtr newScreen, int x, int y)
 {
     sprite.hotPhys.x = x;
     sprite.hotPhys.y = y;
-#ifdef XQUARTZ
-    /* We're seeing a crash here, but I'm not sure what's causing it... so putting in some debugging */
-    snprintf(__crashreporter_info__, __crashreporter_info__len, "%s\n\nNewCurrentScreen debug data\nnoPanoramiXExtension=%d\nnewScreen=%p\nnewScreen->myNum=%d\n",
-             __crashreporter_info__base, noPanoramiXExtension, newScreen, newScreen ? newScreen->myNum : 0);
-    ErrorF("NewCurrentScreen debug data\nnoPanoramiXExtension=%d\nnewScreen=%p\nnewScreen->myNum=%d\n",
-           noPanoramiXExtension, newScreen, newScreen ? newScreen->myNum : 0);
-#endif
 #ifdef PANORAMIX
     if(!noPanoramiXExtension) {
 	sprite.hotPhys.x += panoramiXdataPtr[newScreen->myNum].x - 
@@ -2623,11 +2616,6 @@ ProcWarpPointer(ClientPtr client)
     }
     else if (!PointerConfinedToScreen())
     {
-#ifdef XQUARTZ
-        /* XQuartz is sometimes crashing in NewCurrentScreen with pScreen==NULL, putting some debugging here to maybe catch the culprit */
-        if(newScreen == NULL)
-            ErrorF("ProcWarpPointer: newScreen=%p dest=%p\n", newScreen, dest);
-#endif
         NewCurrentScreen(newScreen, x, y);
     }
     return Success;
diff --git a/mi/mieq.c b/mi/mieq.c
index 9426c023b..0b659f93b 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -214,12 +214,6 @@ mieqProcessInputEvents(void)
         e = &miEventQueue.events[miEventQueue.head];
         miEventQueue.head = (miEventQueue.head + 1) % QUEUE_SIZE;
 
-#ifdef XQUARTZ
-        /* XQuartz is sometimes crashing in NewCurrentScreen with pScreen==NULL, putting some debugging here to maybe catch the culprit */
-        if(miEventQueue.pDequeueScreen==NULL || e->pScreen == NULL)
-            ErrorF("miPointerSetScreen: miEventQueue.pDequeueScreen=%p, e->pScreen=%p, event type=%d\n", miEventQueue.pDequeueScreen, e->pScreen, e->event->u.u.type);
-#endif
-
         /* Assumption - screen switching can only occur on motion events. */
         if (e->pScreen != miEventQueue.pDequeueScreen) {
             miEventQueue.pDequeueScreen = e->pScreen;
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 549f83f53..b86a26a97 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -378,11 +378,6 @@ miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
 	pScreen = screenInfo.screens[screen_no];
 	pScreenPriv = GetScreenPrivate (pScreen);
 	(*pScreenPriv->screenFuncs->NewEventScreen) (pScreen, FALSE);
-#ifdef XQUARTZ
-    /* XQuartz is sometimes crashing in NewCurrentScreen with pScreen==NULL, putting some debugging here to maybe catch the culprit */
-    if(pScreen == NULL)
-        ErrorF("miPointerSetScreen: NewCurrentScreen(%p, %d, %d)\n", pScreen, x, y);
-#endif
 	NewCurrentScreen (pScreen, x, y);
    	miPointer.limits.x2 = pScreen->width;
    	miPointer.limits.y2 = pScreen->height;