cleaning: removing dead code (unused imports and commented out lines)