Back to cleaning up data directories.  Almost done.