Remove unused Broxygen-style script comments.
Merge remote-tracking branch 'origin/topic/jsiwek/misc-fixes'

* origin/topic/jsiwek/misc-fixes:
  Remove unused Broxygen-style script comments.