File cleanup.  Other changes.