Fix conflict with 1.6 codefix
Remove unused import