ISIS-2569: remove all OID legacy
12 files changed