diff --git a/checkin_notes b/checkin_notes
index c6bb959238..d72e37c394 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -10238,3 +10238,13 @@ Rom    17 Dec 2009
         configure.ac
     clientgui/
         sg_DlgPreferences.cpp
+
+Rom    17 Dec 2009
+    - MGR: More cleanup work
+    
+    clientgui/
+        BOINCGUIApp.cpp
+        BOINCTaskBar.cpp
+        sg_ViewTabPage.cpp
+    clientgui/common/
+        wxPieCtrl.cpp, .h
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 8a04f64223..c89157204f 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -159,7 +159,6 @@ bool CBOINCGUIApp::OnInit() {
     wxSystemOptions::SetOption(wxT("msw.staticbox.optimized-paint"), 0);
 #endif
 #ifdef __WXMAC__
-#if wxCHECK_VERSION(2,8,0)
     // In wxMac-2.8.7, default wxListCtrl::RefreshItem() does not work
     // so use traditional generic implementation.
     // This has been fixed in wxMac-2.8.8, but the Mac native implementation:
@@ -168,7 +167,6 @@ bool CBOINCGUIApp::OnInit() {
     //  - causes major flicker of progress bars, (probably due to full redraws.)
     wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), 1);
 #endif
-#endif
 
 
     // Commandline parsing is done in wxApp::OnInit()
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index f7b25625cc..b4094a2e2e 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -513,22 +513,12 @@ bool CTaskBarIcon::SetIcon(const wxIcon& icon) {
 
     RestoreApplicationDockTileImage();      // Remove any previous badge
 
-#if wxCHECK_VERSION(2,8,0)
     if (m_iconTaskBarDisconnected.IsSameAs(icon))
         macIcon = macdisconnectbadge;
     else if (m_iconTaskBarSnooze.IsSameAs(icon))
         macIcon = macsnoozebadge;
     else
         return result;
-#else
-    if (icon == m_iconTaskBarDisconnected)
-        macIcon = macdisconnectbadge;
-    else if (icon == m_iconTaskBarSnooze)
-        macIcon = macsnoozebadge;
-    else
-        return result;
-
-#endif
     
     // Convert the wxIcon into a wxBitmap so we can perform some
     // wxBitmap operations with it
diff --git a/clientgui/common/wxPieCtrl.cpp b/clientgui/common/wxPieCtrl.cpp
index ae3f480059..1b297d861a 100644
--- a/clientgui/common/wxPieCtrl.cpp
+++ b/clientgui/common/wxPieCtrl.cpp
@@ -15,9 +15,6 @@
 
 using namespace std;
 
-#if ! wxCHECK_VERSION(2,8,0)
-WX_DEFINE_OBJARRAY(wxArrayDouble);
-#endif
 WX_DEFINE_OBJARRAY(wxPieSeries);
 
 /* ####### wxPiePart */
diff --git a/clientgui/common/wxPieCtrl.h b/clientgui/common/wxPieCtrl.h
index 5af4fabc86..bd0eccc6f0 100644
--- a/clientgui/common/wxPieCtrl.h
+++ b/clientgui/common/wxPieCtrl.h
@@ -20,10 +20,6 @@
 #define M_PI 3.14159265358979
 #endif
 
-#if ! wxCHECK_VERSION(2,8,0)
-WX_DECLARE_OBJARRAY(double, wxArrayDouble);
-#endif
-
 // ========================================================================
 //  wxPiePart
 // ------------------------------------------------------------------------
diff --git a/clientgui/sg_ViewTabPage.cpp b/clientgui/sg_ViewTabPage.cpp
index 8e90e8ed39..a257b94a69 100644
--- a/clientgui/sg_ViewTabPage.cpp
+++ b/clientgui/sg_ViewTabPage.cpp
@@ -513,13 +513,9 @@ CSkinSimple* pSkinSimple = wxGetApp().GetSkinManager()->GetSimple();
 
     wxLogTrace(wxT("Function Start/End"), wxT("CViewTabPage::DrawText - Begin"));
     
-#if (defined(__WXMAC__) && (! wxCHECK_VERSION(2,8,0)))
-    // wxBufferedDC.GetTextExtent() fails with wxMac-2.6.3, causing Manager to hang
-    wxClientDC dc(this);
-#else
     wxClientDC dcc(this);
 	wxBufferedDC dc(&dcc); 
-#endif
+
     //Project Name
     dc.DrawBitmap(*(pSkinSimple->GetWorkunitAreaBackgroundImage()->GetBitmap()), 0, 0);
 	WriteText(&dc);