Removed time-handling cruft