More cleanup.
Removed unused imports and variables.