Code cleanup: removed unused imports