More unused import removal.