remove unused import and commented out line