ok thanks - i had this same issue yesterday on a very old cluster that i couldnt fix by just moving the definitions from one to the other which is what led me to having both... is it worth just editing the state file for that case?