Also drop target-role when updating clone, group and ms
Fix naming of variable