diff --git a/workflow/platforms/_sandbox.yaml b/workflow/platforms/_sandbox.yaml
index 3251393edba..61001958ad1 100644
--- a/workflow/platforms/_sandbox.yaml
+++ b/workflow/platforms/_sandbox.yaml
@@ -37,14 +37,8 @@ platform: !Platform
 
   # DMPDIR - location of the global dump data.  This is used by the observation
   # processing scripts, which are not included in the public release.
-  DMPDIR: !calc doc.user_places.EXPROOT
+  DMPDIR: !calc doc.user_places.COMROOT
   #"/Users/jiankuang/Documents/Eclipse_workspace/ecfutils_007"
-  #DMPDIR: !FirstTrue
-  #  - do: "/gpfs/gp1/emc/globaldump"
-  #    when: !calc tools.isdir(do)
-  #  - do: "/gpfs/tp1/emc/globaldump"
-  #    when: !calc tools.isdir(do)
-  #  - otherwise: !error "Cannot find globaldump directory."
 
   # RTMFIX - location of the CRTM fixed data files used by the GSI data
   # assimilation.  The data assimilation is not included in this public release
@@ -147,39 +141,22 @@ platform: !Platform
   # Path to mmlsquota, the program used to get GPFS disk usage information:
   #mmlsquota: "/usr/lpp/mmfs/bin/mmlsquota"
 
-  # Automatically detect the least used scrub area the user can access:
-  #least_used_ptmp: !Immediate
-  #  - !FirstMax
-  #    - do: /gpfs/hps3/ptmp
-  #      when: !calc ( int(tools.can_write(do)) * tools.gpfs_gb(do,"hps3-ptmp","hps3",mmlsquota) )
-  #      message: Use {do} for long-term temp.
-  #    - do: /gpfs/hps/ptmp
-  #      when: !calc ( int(tools.can_write(do)) * tools.gpfs_gb(do,"hps-ptmp","hps",mmlsquota) )
-  #      message: Use {do} for long-term temp.
-  #    - do: /gpfs/hps2/ptmp
-  #      when: !calc ( int(tools.can_write(do)) * tools.gpfs_gb(do,"hps2-ptmp","hps2",mmlsquota) )
-  #      message: Use {do} for long-term temp.
-  #least_used_stmp: !Immediate
-  #  - !FirstMax
-  #    - do: /gpfs/hps/stmp
-  #      when: !calc ( int(tools.can_write(do)) * tools.gpfs_gb(do,"hps-stmp","hps",mmlsquota) )
-  #      message: Use {do} for short-term temp.
-  #    - do: /gpfs/hps2/stmp
-  #      when: !calc ( int(tools.can_write(do)) * tools.gpfs_gb(do,"hps2-stmp","hps2",mmlsquota) )
-  #      message: Use {do} for short-term temp.
-  #    - do: /gpfs/hps3/stmp
-  #      when: !calc ( int(tools.can_write(do)) * tools.gpfs_gb(do,"hps3-stmp","hps3",mmlsquota) )
-  #      message: Use {do} for short-term temp.
-
-  # long_term_temp - area for storage of data that must be passed
   # between jobs or shared with programs external to this workflow.
-  long_term_temp: !calc doc.user_places.EXPROOT
-  #!expand "{least_used_ptmp}/{tools.env('USER')}"
+  long_term_temp: !calc doc.user_places.COMROOT
 
   # short_term_temp - area for data that is only needed within one job:
-  short_term_temp: !calc doc.user_places.EXPROOT 
-  #!expand "{least_used_stmp}/{tools.env('USER')}"
+  short_term_temp: !calc doc.user_places.DATAROOT 
+
+  COMROOT: !FirstTrue
+       - do: !expand "{doc.user_places.COMROOT}"
+         when: !calc doc.user_places.FIX_SCRUB
+       - otherwise: !expand "{doc.platform.least_used_temp}/{tools.env('USER')}"
+
+  # short_term_temp - area for data that is only needed within one job:
+  DATAROOT: !FirstTrue
+       - do: !expand "{doc.user_places.DATAROOT}"
+         when: !calc doc.user_places.FIX_SCRUB
+       - otherwise: !expand "{doc.platform.least_used_temp}/{tools.env('USER')}"
 
   # EXPROOT - Parent directory  of the expdir (experiment directory)
   EXPROOT: !calc doc.user_places.EXPROOT
-  #!expand "{doc.user_places.EXPROOT}/noscrub/{tools.env('USER')}"