Remove unused imports (again)