remove unused code
Merge branch 'jira/NMS-6502' into rc/stable/1.14.0