Remove more commented code
Updates #28315