minor: Remove unnecessary commented out code from last commit c28a2f05 and fix up code comment