Remove unused import, variable from code