Clean up unused imports and variables after refactor.