refactor kill driver