cv lexical scope: add comments, remove unused code