Refactor small changes like unused imports.