cleaning timestamp, almost done