more cleanup, benchmarking code moved to separate dir