diff --git a/checkin_notes b/checkin_notes
index 7a963870a3..61d015860d 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5884,3 +5884,15 @@ Rom    19 June 2009
         TermsOfUsePage.cpp, .h
         WelcomePage.cpp
         WizardAttachProject.cpp
+
+David  19 June 2009
+    - install: don't install std_fixes.h or msg_queue.cpp
+    - remove some unused code
+    - scheduler: small code cleanup
+
+    lib/
+        Makefile.am
+        network.u
+        util.h
+    sched/
+        sched_send.cpp
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 96b4041033..93e5a261cc 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -51,7 +51,6 @@ generic_sources = \
     mfile.cpp \
     miofile.cpp \
     msg_log.cpp \
-    msg_queue.cpp \
     network.cpp \
     parse.cpp \
     prefs.cpp \
@@ -110,7 +109,6 @@ pkginclude_HEADERS = \
     mfile.h \
     miofile.h \
     msg_log.h \
-    msg_queue.h \
     network.h \
     parse.h \
     prefs.h \
@@ -118,7 +116,6 @@ pkginclude_HEADERS = \
     shmem.h \
     stackwalker_imports.h \
     stackwalker_win.h \
-    std_fixes.h \
     str_util.h \
     synch.h \
     util.h \
diff --git a/lib/network.h b/lib/network.h
index 061cab6a52..de652f9e28 100644
--- a/lib/network.h
+++ b/lib/network.h
@@ -52,19 +52,6 @@ extern void reset_dns();
 typedef int BOINC_SOCKLEN_T;
 #endif
 
-#ifndef NETWORK_ALIVE_LAN
-#define NETWORK_ALIVE_LAN   0x00000001
-#endif
-
-#ifndef NETWORK_ALIVE_WAN
-#define NETWORK_ALIVE_WAN   0x00000002
-#endif
-
-#ifndef NETWORK_ALIVE_AOL
-#define NETWORK_ALIVE_AOL   0x00000004
-#endif
-
-
 #if defined(_WIN32) && defined(USE_WINSOCK)
 extern int WinsockInitialize();
 extern int WinsockCleanup();
diff --git a/lib/util.h b/lib/util.h
index 2548d85cae..4d84f019be 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -27,10 +27,6 @@
 #include <string>
 #include <vector>
 
-#ifdef HAVE_PTHREAD
-#include <pthread.h>
-#endif
-
 extern double dtime();
 extern double dday();
 extern void boinc_sleep(double);
diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp
index c8f1fc8bb1..f951ed4b9c 100644
--- a/sched/sched_send.cpp
+++ b/sched/sched_send.cpp
@@ -107,17 +107,22 @@ inline int effective_ngpus() {
 // get limits on #jobs per day and per RPC
 //
 inline void get_job_limits() {
-    int n;
-    int mult = effective_ncpus();
-    mult += config.gpu_multiplier * effective_ngpus();
-    n = mult * config.max_wus_to_send * mult;
-    g_wreq->max_jobs_per_rpc = n?n:999999;
+    int mult = effective_ncpus() + config.gpu_multiplier * effective_ngpus();
 
-    if (g_reply->host.max_results_day == 0 || g_reply->host.max_results_day>config.daily_result_quota) {
-        g_reply->host.max_results_day = config.daily_result_quota;
+    if (config.max_wus_to_send) {
+        g_wreq->max_jobs_per_rpc = mult * config.max_wus_to_send;
+    } else {
+        g_wreq->max_jobs_per_rpc = 999999;
+    }
+
+    if (config.daily_result_quota) {
+        if (g_reply->host.max_results_day == 0 || g_reply->host.max_results_day>config.daily_result_quota) {
+            g_reply->host.max_results_day = config.daily_result_quota;
+        }
+        g_wreq->max_jobs_per_day = mult * g_reply->host.max_results_day;
+    } else {
+        g_wreq->max_jobs_per_day = 999999;
     }
-    n = mult * g_reply->host.max_results_day;
-    g_wreq->max_jobs_per_day = n?n:999999;
 }
 
 inline void get_max_jobs_on_host() {