remove unused imports
Merge -s ours from 8.34 into master