CID-1249803 Remove dead code
Merge branch 'bugfix/CID-1249803'