An original Almond? I did not think those supported ZigBee... That would be the 2015, +, 3 or Guards...
Glad you got it fixed, too bad it was such a pain to begin with. With ZigBee you usually do not need to "remove" the devices, they can usually be reset and work from there. But either way, good to hear it is working.