Removing more unused imports.