faster cleanup version