diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 2d8e282c99..dcc488e1e2 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -29,9 +29,6 @@ extern "C"
     struct GSocketGUIFunctionsTable;
 }
 
-// FIXME: Eventually unify Mac OS 9
-class GSocketBSD;
-
 // ----------------------------------------------------------------------------
 // toolkit information
 // ----------------------------------------------------------------------------
@@ -116,10 +113,6 @@ public:
 #if wxUSE_SOCKETS
     // return table of GUI callbacks for GSocket code or NULL in wxBase
     virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable() = 0;
-
-    // return a new GSocket with the EventLoop_* stuff implemented.
-    // or at least stubbed (i.e. wxBase)
-    virtual GSocketBSD* CreateGSocket() = 0;
 #endif
 
 
@@ -175,7 +168,6 @@ public:
     virtual wxRendererNative *CreateRenderer();
 #if wxUSE_SOCKETS
     virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
-    virtual GSocketBSD* CreateGSocket();
 #endif
 
 #ifdef __WXDEBUG__
@@ -206,9 +198,6 @@ public:
     virtual wxRendererNative *CreateRenderer();
 #if wxUSE_SOCKETS
     virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
-    // return a new GSocket with the EventLoop_* stuff implemented.
-    // TODO: Remove this because each GUI should implement it separately
-    virtual GSocketBSD* CreateGSocket();
 #endif
 
 #ifdef __WXDEBUG__
diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 941c8aa71b..706c1c97c8 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -53,10 +53,6 @@
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 
-#if wxUSE_SOCKETS
-    #include "wx/gsocket.h"
-#endif // wxUSE_SOCKETS
-
 #if defined(__WXMAC__)
     // VZ: MacTypes.h is enough under Mac OS X (where I could test it) but
     //     I don't know which headers are needed under earlier systems so
@@ -479,16 +475,6 @@ GSocketGUIFunctionsTable* wxConsoleAppTraitsBase::GetSocketGUIFunctionsTable()
 {
     return NULL;
 }
-
-// TODO: Use a different class that only stubs out the event loop functions
-GSocketBSD* wxConsoleAppTraitsBase::CreateGSocket()
-{
-#ifdef wxUSE_GSOCKET_CPLUSPLUS
-    return new GSocketBSDGUIShim();
-#else
-    return NULL;
-#endif
-}
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 5bfa14b7f6..c6e0fc945b 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -605,14 +605,5 @@ GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
 #endif // !__WXMAC__ || __DARWIN__
 }
 
-GSocketBSD* wxGUIAppTraitsBase::CreateGSocket()
-{
-#ifdef wxUSE_GSOCKET_CPLUSPLUS
-    return new GSocketBSDGUIShim();
-#else
-    return NULL;
-#endif
-}
-
 #endif
 
diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 33785cc31f..28bbb98194 100644
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -1404,7 +1404,7 @@ void GSocketBSD::Detected_Write()
 /* Compatibility functions for GSocket */
 GSocket *GSocket_new(void)
 {
-    GSocket *newsocket = wxTheApp->GetTraits()->CreateGSocket();
+    GSocket *newsocket = new GSocketBSDGUIShim();
     if(newsocket->IsOk())
         return newsocket;
     delete newsocket;