diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 0c15d2a85d..4b5a93d453 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -46,7 +46,6 @@
 #include "wx/thread.h"
 #include "wx/utils.h"
 #include "wx/ptr_scpd.h"
-#include "wx/prntbase.h"
 
 #if defined(__WXMSW__) && !defined(__PALMOS__)
   #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
@@ -141,8 +140,6 @@ void wxAppBase::CleanUp()
         delete wxTopLevelWindows.GetFirst()->GetData();
     }
     
-    wxPrintFactory::SetPrintFactory( NULL );
-
     // undo everything we did in Initialize() above
     wxBitmap::CleanUpHandlers();
 
diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index e201b9d82c..5d24eb9e7d 100644
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -829,6 +829,10 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
     TransferDataFromWindow();
 
     // Transfer the current print settings from this dialog to the page setup dialog.
+    
+#if 0
+    // Use print factory later    
+    
     wxPrintDialogData data;
     data = GetPageSetupData().GetPrintData();
     data.SetSetupDialog(true);
@@ -842,6 +846,7 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
 
     // Now update the dialog in case the page setup dialog changed some of our settings.
     TransferDataToWindow();
+#endif
 }
 
 wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,