DAR-1263: no end of line comments
DAR-1263: more cleanup.