XD-700: Removed custom UUIDGenerator