More responsive cleanup