Code cleanup: remove unused imports