Remove UUID dependency
