Remove use of now private uniqueIdentifier accessor