Remove dead code, add clarification to a comment.
Remove spurious --toc option.  Some output cleanup.