Cleanup: Remove some commented out code
Authored by: david_costanzo 2020-12-20
Parent: [r5530]
Child: [r5532]