Optimized redundancy cleanup