SI-7469 Remove misc. @deprecated elements
Merge pull request #3293 from soc/SI-7469

 Remove misc. @deprecated elements