more cleanup
benchmark cleanup