cleanup
vthreads-test revamp