[#522] Remove comments and commenting docs

Fixes #522
Merge branch '522'