Cleaning & benchmarks