Issue #20715: Removed comments and unused code.