Remove unused import and variable