Thorough cleanup