Remove no longer relevant @todo

Change-Id: I60c9a3283429044f3b37029821367e322864baba
Don't hardcode timestamp format in UUID helper method

Change-Id: I1531e519f5d40e5dba11ecbbdb0a697e2f2b23e3