More comment cleanup and removal of dead code.