[3.9] Remove commented code