uncommenting / removing commented lines following MR 54435

Thanks to @akong for having pointed out a few instances where lines were left in that were commented in MR !54435 (merged). I've addressed these changes in this MR by either adding them back in or removing them completely.

Thanks for the careful check again and allowing the original MR to be merged and your comments to be followed up separately!