Remove refactor orphaned variables
Remove unused import