We've managed to replicate similar behavior that could be related to what is happening on your system - when node is removed from template, the .xml does not get deleted from that node. You can follow resolution progress here: https://track.radensolutions.com/issue/NX-1704