fix: removed unused comments per sonarqube

Derek Zhangrequested to merge
derekxz-code-quality into master

Sonarqube s125 issue fix: remove unused comments

Merge request reports