continued cleanup, not finished