Merge "Remove unused imports and variables." into nyc-dev