Remove unused imports; rename to avoid "hiding field" warnings.
5 files changed