merged with benchmark tool branch
cleanup