Remove use of {String,UUID}Identifier