make cleanup faster