Enhance doc generation

Remove dead code
Rollback some recent stylecop-inspired reformattings