Addresses bug 1061888 review
Removes block comments
Removes "Mode:" and "vim:" comments
Merge pull request #1657 from yurydelendik/bug1061888

Addresses bug 1061888 review