ENH: Better file clean-up.  No change in result with this patch.
ENH: Better file clean-up.  No change in result with this patch.