more thorough cleanup