More thorough clean target