Remove further unused imports