diff --git a/client/cs_benchmark.C b/client/cs_benchmark.C
index 7d8d19cec0..8dfff6897e 100644
--- a/client/cs_benchmark.C
+++ b/client/cs_benchmark.C
@@ -88,9 +88,6 @@ static int bm_state;
 #define BENCHMARK_PERIOD        (SECONDS_PER_DAY*5)
     // rerun CPU benchmarks this often (hardware may have been upgraded)
 
-extern void guiOnBenchmarksBegin();
-extern void guiOnBenchmarksEnd();
-
 // represents a benchmark thread/process, in progress or completed
 //
 struct BENCHMARK_DESC {
@@ -195,7 +192,6 @@ void CLIENT_STATE::start_cpu_benchmarks() {
             host_info.p_ncpus, sizeof(BENCHMARK_DESC)
         );
     }
-    guiOnBenchmarksBegin();
     benchmarks_running = true;
 
     for (i=0; i<host_info.p_ncpus; i++) {
@@ -338,7 +334,6 @@ bool CLIENT_STATE::cpu_benchmarks_poll() {
         host_info.p_iops = DEFAULT_IOPS;
         host_info.p_membw = DEFAULT_MEMBW;
         host_info.m_cache = DEFAULT_CACHE;
-        guiOnBenchmarksEnd();
         benchmarks_running = false;
         set_client_state_dirty("CPU benchmarks");
     }
@@ -394,7 +389,6 @@ bool CLIENT_STATE::cpu_benchmarks_poll() {
 #endif
 
         host_info.p_calculated = now;
-        guiOnBenchmarksEnd();
         benchmarks_running = false;
 	    msg_printf(NULL, MSG_INFO, "Finished CPU benchmarks");
         set_client_state_dirty("CPU benchmarks");
diff --git a/client/main.C b/client/main.C
index 364d12e7c8..936e0b6b1c 100644
--- a/client/main.C
+++ b/client/main.C
@@ -53,9 +53,6 @@ typedef void (CALLBACK* IdleTrackerTerm)();
 #include "client_msgs.h"
 #include "main.h"
 
-// dummies
-void guiOnBenchmarksBegin(){}
-void guiOnBenchmarksEnd(){}
 
 // This gets called when the client fails to add a project
 //
@@ -238,6 +235,11 @@ int boinc_main_loop(int argc, char** argv) {
 
     setbuf(stdout, 0);
 
+    read_log_flags();
+    gstate.parse_cmdline(argc, argv);
+    gstate.parse_env_vars();
+
+
     boinc_init_diagnostics(
         BOINC_DIAG_DUMPCALLSTACKENABLED
         | BOINC_DIAG_HEAPCHECKENABLED
@@ -248,6 +250,7 @@ int boinc_main_loop(int argc, char** argv) {
 #endif
     );
 
+
     retval = check_unique_instance();
     if (retval) {
         msg_printf(NULL, MSG_INFO, "Another instance of BOINC is running");
@@ -280,9 +283,6 @@ int boinc_main_loop(int argc, char** argv) {
     }
 #endif
 
-    read_log_flags();
-    gstate.parse_cmdline(argc, argv);
-    gstate.parse_env_vars();
     retval = gstate.init();
     if (retval) {
         fprintf(stderr, "gstate.init() failed: %d\n", retval);
diff --git a/client/win/wingui_mainwindow.cpp b/client/win/wingui_mainwindow.cpp
index 649c296eb9..042576489c 100755
--- a/client/win/wingui_mainwindow.cpp
+++ b/client/win/wingui_mainwindow.cpp
@@ -1618,7 +1618,6 @@ void CMainWindow::OnCommandExit()
     m_ContextMenu.DestroyMenu();
 
     // free dll and idle detection
-#ifdef ENABLEIDLE
 	if(g_hIdleDetectionDll) {
         typedef void (CALLBACK* TermFn)();
         TermFn fn;
@@ -1628,9 +1627,6 @@ void CMainWindow::OnCommandExit()
         } else {
             fn();
         }
-    }
-#endif
-	if(g_hIdleDetectionDll) {
 	    FreeLibrary(g_hIdleDetectionDll);
         g_hIdleDetectionDll = NULL;
 	}
@@ -1872,9 +1868,7 @@ int CMainWindow::OnCreate(LPCREATESTRUCT lpcs)
     g_hIdleDetectionDll = LoadLibrary("boinc.dll");
     if(!g_hIdleDetectionDll) {
         show_message(NULL,"Can't load \"boinc.dll\", will not be able to determine idle time", MSG_ERROR);
-    }
-#ifdef ENABLEIDLE
-	else {
+    } else {
         typedef BOOL (CALLBACK* InitFn)();
         InitFn fn;
         fn = (InitFn)GetProcAddress(g_hIdleDetectionDll, "IdleTrackerInit");
@@ -1890,7 +1884,6 @@ int CMainWindow::OnCreate(LPCREATESTRUCT lpcs)
             }
         }
     }
-#endif
 
     UpdateGUI(&gstate);
 
@@ -2308,15 +2301,5 @@ void project_add_failed(PROJECT* project) {
     // TODO: To be filled in
 }
 
-void guiOnBenchmarksBegin()
-{
-    g_myWnd->OnBenchmarksBegin();
-}
-
-void guiOnBenchmarksEnd()
-{
-    g_myWnd->OnBenchmarksEnd();
-}
-
 
 const char *BOINC_RCSID_3eaaa7525d = "$Id$";