More gettimeofday cleanup