Cleanup of temporal expressions