Removed use of TimeUnit