fix cleanup too much