Minor - improve documentation, remove unused code and fix code style  - refs CT#7255