Revert "Add empty string check of uuid"