Improved unused imports detection #SCL-4784 Fixed