Remove timestamp, fix time