upgraded jmh. cleanup