Cleaned up old Benchmarks and unused code.