Removed use of check_alive