New, more general file
clean up