Clean up time

Change-Id: I323a69eb824f68ffa903057b89084d29e23c1a5c