made cleanup work faster