[3.9] Remove unused code