fix cleanup