Remove unused import and code block