Cleanup: Remove unused imports