remove TimeUnit implementation and use java.util.concurrent.TimeUnit instead