Removed the uuid hack