Remove more duplicate imports