rename kill to stop
cleanup