Patch #2167 from calvin: Remove unused imports
203 files changed