Bundle: clean up
Project: clean up UUID generation