Remove self referencing UUID madness