comments clean up
Merge pull request #2786 from 66eli77/develop

comments clean up