cleanup imports
cleanup tests, remove timer-race