STYLE: Delete commented code

21 jobs for release-8.0 in 153 minutes and 40 seconds (queued for 3 seconds)