reworked spill file cleanup