cleanup: remove unused imports and unnecessary variable