benchmark cleanup for use with d8