CLEANUP: Remove unused imports