Remove UUID references