No longer leave temporary files behind so easily