Cleaning optimizations