Remove functions and add make.date.time