Cleanup: unused imports