Code cleanup - Removed unused imports