Sample clean up