add another simplified cleaner, improve benchmarks