Made suite-wide after cleanup method more thorough. [ci skip]