Fixed #21302 -- Fixed unused imports and import *.