Remove remaining use of * imports.