Remove unused imports, bug #469022