remove benchmarking tools, clean includes