Remove commented code
Updates #28315