diff --git a/src/osgViewer/GraphicsWindowX11.cpp b/src/osgViewer/GraphicsWindowX11.cpp
index f46c32845..9ee634219 100644
--- a/src/osgViewer/GraphicsWindowX11.cpp
+++ b/src/osgViewer/GraphicsWindowX11.cpp
@@ -2277,43 +2277,8 @@ public:
 
 };
 
-#if 1
-
 REGISTER_WINDOWINGSYSTEMINTERFACE(X11, X11WindowingSystemInterface)
 
-
-#else
-struct RegisterWindowingSystemInterfaceProxy
-{
-    RegisterWindowingSystemInterfaceProxy()
-    {
-        OSG_INFO<<"RegisterWindowingSystemInterfaceProxy()"<<std::endl;
-        osg::GraphicsContext::setWindowingSystemInterface(new X11WindowingSystemInterface);
-    }
-
-    ~RegisterWindowingSystemInterfaceProxy()
-    {
-        OSG_INFO<<"~RegisterWindowingSystemInterfaceProxy()"<<std::endl;
-
-        if (osg::Referenced::getDeleteHandler())
-        {
-            osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(0);
-            osg::Referenced::getDeleteHandler()->flushAll();
-        }
-
-        osg::GraphicsContext::setWindowingSystemInterface(0);
-
-    }
-};
-RegisterWindowingSystemInterfaceProxy createWindowingSystemInterfaceProxy;
-
-// declare C entry point for static compilation.
-extern "C" void graphicswindow_X11(void)
-{
-    osg::GraphicsContext::setWindowingSystemInterface(new X11WindowingSystemInterface);
-}
-#endif
-
 void GraphicsWindowX11::raiseWindow()
 {
     Display* display = getDisplayToUse();