Removing commented out code (esup is better for benchmarking anyway).