I follow this instruction as I have always for RDS or TS image deployment using Citrix MCS:
With Windows 10 deployment, I remove the same information from the registry but it doesn't seem to work, not for the master servers at least. I am finding I have to reinstall or just access via RDS. The new machines, when they deploy, appear to have the Control app working and no duplicates happen on next wipe and reload.
Customer support service by UserEcho