Last touch to removing gettimeofday