Remove unused imports
Released 4.1