Remove use of device unique identifier.