Merge "Remove unused import"