Remove timestamp, didn't work correctly