Cleaning up comments

Reviewed by:pdey
Testing:
Tickets:
Backport: