Transferring FSMO role

I have production server running in eval mode. To upgrade license I installed another server on hyper-V of same physical host and transfer all FSMO roles. After transfer repadmin was generating error on main server but it worked fine on secondary server (all these worked fine in lab test).
I tried moving FSMO back but it did not help, therefore, I put FSMO on guest again some worked from pshell, some transfer worked form ntdsutil and some worked from console.
Eventually, I tried removing ADDS form host machine and instead of completely removing it suggested me to make it workgroup and stayed with an alert action as promote to DC.
I removed DC from users and computer container, removed NTDS from AD sites and services but it does not allow me to remove DC name from AD sites services. Tried ntdsutil metadata cleanup and it still does not remove.
Option to make it a workgroup is grayed out and DCpromo /force does work either.
Is there any ways to cleanup from adsiedit or more granular level of cleanup. If hyper-v is the only service running I should be able to able to join it back to domain, as DC on hyperV stars automatically with physical host????