diff --git a/checkin_notes b/checkin_notes
index 2853c5e574..f47d670a0b 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -16215,3 +16215,12 @@ Daniel 2004-08-11
         app_control.C
         app_start.C
 
+David  11 Aug 2004
+    - comment out disk-management code, pending a review.
+
+    client/
+        client_state.C
+        client_types.C
+        cs_data.C
+        cs_scheduler.C
+        scheduler_op.C
diff --git a/client/client_state.C b/client/client_state.C
index b5ddb37b74..418f9522e7 100644
--- a/client/client_state.C
+++ b/client/client_state.C
@@ -390,7 +390,7 @@ bool CLIENT_STATE::do_something() {
     ss_logic.poll();
     if (activities_suspended) {
         scope_messages.printf("CLIENT_STATE::do_something(): activities suspended\n");
-        POLL_ACTION(data_manager           , data_manager_poll      );
+        //POLL_ACTION(data_manager           , data_manager_poll      );
         POLL_ACTION(net_xfers              , net_xfers->poll        );
         POLL_ACTION(http_ops               , http_ops->poll         );
         POLL_ACTION(active_tasks           , active_tasks.poll      );
@@ -400,7 +400,7 @@ bool CLIENT_STATE::do_something() {
         POLL_ACTION(gui_rpc                , gui_rpcs.poll          );
     } else if (network_suspended) {
         scope_messages.printf("CLIENT_STATE::do_something(): network suspended\n");
-        POLL_ACTION(data_manager           , data_manager_poll      );
+        //POLL_ACTION(data_manager           , data_manager_poll      );
         POLL_ACTION(net_xfers              , net_xfers->poll        );
         POLL_ACTION(http_ops               , http_ops->poll         );
         POLL_ACTION(active_tasks           , active_tasks.poll      );
@@ -415,7 +415,7 @@ bool CLIENT_STATE::do_something() {
         // Call these functions in bottom to top order with
         // respect to the FSM hierarchy
         //
-        POLL_ACTION(data_manager           , data_manager_poll      );
+        //POLL_ACTION(data_manager           , data_manager_poll      );
         POLL_ACTION(net_xfers              , net_xfers->poll        );
         POLL_ACTION(http_ops               , http_ops->poll         );
         POLL_ACTION(file_xfers             , file_xfers->poll       );
@@ -535,13 +535,16 @@ int CLIENT_STATE::link_app(PROJECT* p, APP* app) {
 int CLIENT_STATE::link_file_info(PROJECT* p, FILE_INFO* fip, bool from_server) {
 	if (lookup_file_info(p, fip->name)) return ERR_NOT_UNIQUE;
     fip->project = p;
-    if(from_server) {
-        if(p->associate_file(fip)) {
+#if 0
+    if (from_server) {
+        if (p->associate_file(fip)) {
             return 0;
         } else {
             return 1;
         }
     }
+#endif
+
     return 0;
 }
 
diff --git a/client/client_types.C b/client/client_types.C
index a3d47c11a2..bea210e84b 100644
--- a/client/client_types.C
+++ b/client/client_types.C
@@ -494,6 +494,8 @@ char* PROJECT::get_project_name() {
 }
 
 bool PROJECT::associate_file(FILE_INFO* fip) {
+    return 0;
+#if 0
     double space_made = 0;
     if(gstate.get_more_disk_space(this, fip->nbytes)) {
         size += fip->nbytes;
@@ -508,6 +510,7 @@ bool PROJECT::associate_file(FILE_INFO* fip) {
     } else {
         return false;
     }
+#endif
 }
 
 int APP::parse(MIOFILE& in) {
diff --git a/client/cs_data.C b/client/cs_data.C
index afa62921ec..14eae68205 100644
--- a/client/cs_data.C
+++ b/client/cs_data.C
@@ -40,6 +40,7 @@
 
 using std::vector;
 
+#if 0
 
 // This gets called when the client doesn't have enough disk space to continue
 // running active tasks.
@@ -562,3 +563,4 @@ double CLIENT_STATE::proj_potentially_free(PROJECT* p) {
     return tps;
 }
 
+#endif
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index 7dd1017f96..c85d651f7f 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -162,8 +162,9 @@ int CLIENT_STATE::make_scheduler_request(PROJECT* p, double work_req) {
     unsigned int i;
     RESULT* rp;
     int retval;
-    double free;
-    double possible;
+#if 0
+    double free, possible;
+#endif
     char cross_project_id[MD5_LEN];
 
     trs = total_resource_share();
@@ -202,12 +203,14 @@ int CLIENT_STATE::make_scheduler_request(PROJECT* p, double work_req) {
 		}
 		fprintf(f, "    </app_versions>\n");
 	}
+#if 0
     anything_free(free);
     fprintf(f, "    <project_disk_free>%f</project_disk_free>\n", free);
     total_potential_offender(p, possible);
     fprintf(f, "    <potentially_free_offender>%f</potentially_free_offender>\n", possible);
     total_potential_self(p, possible);
     fprintf(f, "    <potentially_free_self>%f</potentially_free_self>\n", possible);
+#endif
     if (strlen(p->code_sign_key)) {
         fprintf(f, "    <code_sign_key>\n%s</code_sign_key>\n", p->code_sign_key);
     }
diff --git a/client/scheduler_op.C b/client/scheduler_op.C
index bf99d5dd18..49b38f3290 100644
--- a/client/scheduler_op.C
+++ b/client/scheduler_op.C
@@ -472,7 +472,9 @@ bool SCHEDULER_OP::poll() {
                     } else {
                         project->tentative = false;
                         project->write_account_file();
+#if 0
                         gstate.calc_all_proj_size();
+#endif
                     }
                 } else {
                     switch (retval) {